diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6d07349b..31ce987b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -147,7 +147,7 @@ jobs: run: ./mvnw -B -ntp test -pl . -P no-poi binary-compat: - name: Binary Compatibility (japicmp vs v1.6.9) + name: Binary Compatibility (japicmp vs pom baseline) if: github.event_name == 'pull_request' needs: architecture-and-documentation-guards runs-on: ubuntu-latest @@ -166,8 +166,9 @@ jobs: cache: maven - name: Compare public API against baseline - # The `japicmp` profile resolves the prior published jar - # (v1.6.8 from Maven Central) and diffs it against the + # The `japicmp` profile resolves the baseline release pinned + # by the `japicmp.baseline` property in pom.xml (via the + # profile-local JitPack repository) and diffs it against the # freshly-built artifact. Fails the job on any binary- # incompatible modification to the public surface. Source- # incompatible changes are reported only (phased policy). diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c3bac84b..64784acb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -95,6 +95,15 @@ Entries land here as they merge. not fit in the remaining page space relocates whole to the next page instead of orphaning its heading from the content below. Blocks taller than a page still flow. Default off — existing layouts are byte-identical. +- **Removed: `ConfigLoader`** (breaking). The `com.demcha.compose.ConfigLoader` + YAML/JSON config-file helper was an application-bootstrap utility with no + connection to document rendering — nothing in the library, tests, or + examples referenced it. Gone with it: the `` + `jackson-dataformat-yaml` dependency (ConfigLoader was its only consumer) + and the YAML entry in the `NoClassDefFoundError` troubleshooting section. + Consumers who relied on the helper can copy the former ~100-line class into + their own codebase or load configs directly with Jackson + (`new ObjectMapper(new YAMLFactory()).readValue(...)`). ### Bug fixes @@ -136,6 +145,15 @@ Entries land here as they merge. regression testing. Every snippet is verified against the current API; the folder index (`docs/recipes/README.md`) no longer carries a "not yet covered" list. +- **Word-export example.** New `WordExportExample` + (`examples/features/docx`) renders the same `DocumentSession` as a + fixed-layout PDF *and* an editable Word file via `DocxSemanticBackend`, + one section per capability-table row: inline runs, nested lists with + custom markers, tables, side-by-side rows, an embedded image, a page + break, the chart→data-table fallback, and the geometry that stays + PDF-only. Committed previews live under `assets/readme/examples/` + (`word-export-companion.pdf` / `.docx`); the examples module adds the + optional `poi-ooxml` dependency exactly like a consuming project would. - **`BusinessReportExample` chart is now a native vector chart.** The flagship report's five-quarter Revenue/Profit block previously rasterised a bar chart through Graphics2D into an embedded PNG; it now uses `ChartSpec.bar()` with a diff --git a/assets/readme/examples/word-export-companion.docx b/assets/readme/examples/word-export-companion.docx new file mode 100644 index 000000000..43ff0d055 Binary files /dev/null and b/assets/readme/examples/word-export-companion.docx differ diff --git a/assets/readme/examples/word-export-companion.pdf b/assets/readme/examples/word-export-companion.pdf new file mode 100644 index 000000000..77ba11cdf Binary files /dev/null and b/assets/readme/examples/word-export-companion.pdf differ diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 7a9279178..4b08cdaa1 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -39,8 +39,8 @@ Per-feature mapping: [canonical ↔ legacy parity matrix](architecture/canonical ## `NoClassDefFoundError` at runtime -GraphCompose marks two heavy, rarely-needed dependencies **optional** so -PDF-only consumers don't pay for them. If you use the feature, add the +GraphCompose marks one heavy, rarely-needed dependency **optional** so +PDF-only consumers don't pay for it. If you use DOCX export, add the dependency to **your** project. **DOCX export** — `document.export(new DocxSemanticBackend())` needs @@ -54,20 +54,6 @@ Apache POI on your classpath: ``` -**YAML config** — loading a `*.yaml` / `*.yml` resource through -`ConfigLoader` needs the Jackson YAML dataformat (the error names -`YAMLFactory`): - -```xml - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - -``` - -…or load a JSON config instead, which needs no extra dependency. - ## The bundled examples won't resolve `graph-compose` **Cause.** `examples/` is a **separate Maven module** that depends on the diff --git a/examples/README.md b/examples/README.md index fea013c73..a1c08f539 100644 --- a/examples/README.md +++ b/examples/README.md @@ -93,6 +93,7 @@ are with the canonical DSL, then jump to its detailed section below. | [Charts](#charts) | Native vector bar, line, and pie/donut charts — data/spec/style layers, axis & grid toggles, point markers, value labels, legend | [PDF](../assets/readme/examples/chart-showcase.pdf) · [Source](src/main/java/com/demcha/examples/features/charts/ChartShowcaseExample.java) | | [PDF chrome](#pdf-chrome) | `DocumentMetadata`, `DocumentWatermark`, `DocumentHeaderFooter`, `DocumentBookmarkOptions` | [PDF](../assets/readme/examples/pdf-chrome.pdf) · [Source](src/main/java/com/demcha/examples/features/chrome/PdfChromeExample.java) | | [HTTP streaming](#http-streaming) | `writePdf(OutputStream)` for Servlet / S3 / GCS — caller's stream is not closed | [PDF](../assets/readme/examples/invoice-http-stream.pdf) · [Source](src/main/java/com/demcha/examples/features/streaming/HttpStreamingExample.java) | +| [Word export (DOCX)](#word-export-docx) | `DocxSemanticBackend` — the same session renders a fixed-layout PDF and an editable Word file; paragraphs / lists / tables / images map 1:1, charts fall back to their data table | [PDF](../assets/readme/examples/word-export-companion.pdf) · [DOCX](../assets/readme/examples/word-export-companion.docx) · [Source](src/main/java/com/demcha/examples/features/docx/WordExportExample.java) | | [Layout snapshot regression](#layout-snapshot-regression) | Deterministic `layoutSnapshot()` workflow with baseline + drift report — production regression-testing pattern | [PDF](../assets/readme/examples/invoice-snapshot-regression.pdf) · [Source](src/main/java/com/demcha/examples/features/snapshots/LayoutSnapshotRegressionExample.java) | | [Business report cover](#business-report-cover) | Single-page Q1 investor brief — hero image, KPI cards, bar chart, metrics table | [PDF](../assets/readme/examples/business-report.pdf) · [Source](src/main/java/com/demcha/examples/flagships/BusinessReportExample.java) | | [Master showcase](#master-showcase) | Kitchen-sink "Q2 sample report" combining the canonical surface end-to-end | [PDF](../assets/readme/examples/master-showcase.pdf) · [Source](src/main/java/com/demcha/examples/flagships/MasterShowcaseExample.java) | @@ -576,6 +577,47 @@ public ResponseEntity invoice(@PathVariable Long id) { [📄 View PDF](../assets/readme/examples/invoice-http-stream.pdf) · [📜 Full source](src/main/java/com/demcha/examples/features/streaming/HttpStreamingExample.java) +### Word export (DOCX) + +The semantic backend walks the document graph and writes **editable +Word content** — no layout pass, no PDF chrome. One session, two +outputs: + +```java +try (DocumentSession document = GraphCompose.document(pdfFile) + .pageSize(595, 842) + .margin(DocumentInsets.of(48)) + .create()) { + document.metadata(DocumentMetadata.builder() + .title("GraphCompose Word export companion") + .author("GraphCompose").build()); // → Word core properties + + document.pageFlow().name("Flow") + .addRich(rich -> rich.plain("Inline ").bold("runs").plain(" survive.")) + .addList(list -> list.markerFor(1, ListMarker.custom("◦")) + .addItem("Nested authoring", l1 -> l1 + .addItem("Two spaces of indent per depth in Word"))) + .addTable(t -> t.headerRow("Quarter", "Revenue").row("Q1", "42")) + .addSection("Chart", s -> s.chart(ChartSpec.bar().data(quarters).build())) + .build(); + + document.buildPdf(); // fixed-layout PDF + document.export(new DocxSemanticBackend(), docxFile); // editable Word file +} +``` + +Paragraphs (inline runs included), lists, tables, side-by-side rows, +images, spacers, and page breaks map 1:1; session metadata lands in the +Word core properties. Charts export as their categories-by-series data +table (one capability warning per export), shape containers flatten to +inline layers, and pure geometry — dividers, shapes, barcodes — stays +PDF-only by design. Requires `org.apache.poi:poi-ooxml` on the +classpath (the dependency is optional in the GraphCompose POM). + +[📄 View PDF](../assets/readme/examples/word-export-companion.pdf) · +[📝 Word file](../assets/readme/examples/word-export-companion.docx) · +[📜 Full source](src/main/java/com/demcha/examples/features/docx/WordExportExample.java) + ### Layout snapshot regression The full `compose → layoutSnapshot() → LayoutSnapshotJson.toJson(...)` diff --git a/examples/pom.xml b/examples/pom.xml index 92107adfa..0626462a6 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -44,6 +44,15 @@ ${graphcompose.version} + + + org.apache.poi + poi-ooxml + 5.5.1 + + ch.qos.logback logback-classic diff --git a/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java b/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java index 53a00824f..099e78bf5 100644 --- a/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java +++ b/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java @@ -3,6 +3,7 @@ import com.demcha.examples.features.barcodes.BarcodeShowcaseExample; import com.demcha.examples.features.charts.ChartShowcaseExample; import com.demcha.examples.features.canvas.CanvasLayerExample; +import com.demcha.examples.features.docx.WordExportExample; import com.demcha.examples.features.chrome.PdfChromeExample; import com.demcha.examples.features.lists.NestedListExample; import com.demcha.examples.features.shapes.ShapeContainerExample; @@ -138,6 +139,9 @@ public static void main(String[] args) throws Exception { System.out.println("Generated: " + CustomBusinessThemeExample.generate()); System.out.println("Generated: " + PdfChromeExample.generate()); + // DOCX export + System.out.println("Generated: " + WordExportExample.generate()); + // Barcodes System.out.println("Generated: " + BarcodeShowcaseExample.generate()); diff --git a/examples/src/main/java/com/demcha/examples/features/docx/WordExportExample.java b/examples/src/main/java/com/demcha/examples/features/docx/WordExportExample.java new file mode 100644 index 000000000..e16da1429 --- /dev/null +++ b/examples/src/main/java/com/demcha/examples/features/docx/WordExportExample.java @@ -0,0 +1,212 @@ +package com.demcha.examples.features.docx; + +import com.demcha.compose.GraphCompose; +import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.backend.semantic.DocxSemanticBackend; +import com.demcha.compose.document.chart.ChartData; +import com.demcha.compose.document.chart.ChartSpec; +import com.demcha.compose.document.image.DocumentImageData; +import com.demcha.compose.document.node.ListMarker; +import com.demcha.compose.document.output.DocumentMetadata; +import com.demcha.compose.document.style.DocumentColor; +import com.demcha.compose.document.style.DocumentInsets; +import com.demcha.compose.document.style.DocumentStroke; +import com.demcha.compose.document.style.DocumentTextDecoration; +import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.table.DocumentTableColumn; +import com.demcha.compose.font.FontName; +import com.demcha.examples.support.ExampleOutputPaths; + +import javax.imageio.ImageIO; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.GradientPaint; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.nio.file.Path; + +/** + * One document, two outputs: the same {@link DocumentSession} renders a + * fixed-layout PDF and exports an editable Word file through + * {@link DocxSemanticBackend}. Each section demonstrates one row of the + * DOCX capability table from {@code docs/recipes/docx-export.md}: + * styled paragraphs and inline runs map 1:1, lists keep markers and + * per-depth indent, tables and side-by-side rows stay tables, images + * embed at their declared size, page breaks survive, charts fall back to + * their data table, and pure geometry (dividers, shape containers) stays + * PDF-only by design. + * + *

Requires {@code org.apache.poi:poi-ooxml} on the classpath — the + * dependency is optional in the GraphCompose POM, so this module adds it + * explicitly, exactly like a consuming project would.

+ * + * @author Artem Demchyshyn + */ +public final class WordExportExample { + + private static final DocumentColor INK = DocumentColor.rgb(34, 38, 50); + private static final DocumentColor MUTED = DocumentColor.rgb(102, 106, 118); + private static final DocumentColor NAVY = DocumentColor.rgb(20, 45, 80); + private static final DocumentColor GOLD = DocumentColor.rgb(196, 153, 76); + private static final DocumentColor TEAL = DocumentColor.rgb(20, 80, 95); + + private WordExportExample() { + } + + public static Path generate() throws Exception { + Path pdfFile = ExampleOutputPaths.prepare("features/docx", "word-export-companion.pdf"); + Path docxFile = ExampleOutputPaths.prepare("features/docx", "word-export-companion.docx"); + + DocumentTextStyle title = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA_BOLD) + .size(20) + .color(NAVY) + .decoration(DocumentTextDecoration.BOLD) + .build(); + DocumentTextStyle heading = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA_BOLD) + .size(13) + .color(INK) + .decoration(DocumentTextDecoration.BOLD) + .build(); + DocumentTextStyle body = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA) + .size(11) + .color(INK) + .build(); + DocumentTextStyle caption = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA_OBLIQUE) + .size(10) + .color(MUTED) + .build(); + + ChartData quarters = ChartData.builder() + .categories("Q1", "Q2", "Q3", "Q4") + .series("Revenue", 42.0, 55.0, 61.0, 70.0) + .series("Profit", 12.0, 17.0, 21.0, 26.0) + .build(); + DocumentImageData photo = demoImage(); + + try (DocumentSession document = GraphCompose.document(pdfFile) + .pageSize(595, 842) + .margin(DocumentInsets.of(48)) + .create()) { + + // Session metadata lands in the PDF info dictionary AND the + // Word core properties (File > Info in Word). + document.metadata(DocumentMetadata.builder() + .title("GraphCompose Word export companion") + .author("GraphCompose") + .subject("Every node the semantic DOCX backend maps, falls back on, or skips") + .keywords("graphcompose, docx, semantic export") + .build()); + + document.pageFlow().name("Flow").spacing(14) + .addParagraph("GraphCompose → Word, from one document", title) + .addRich(rich -> rich + .plain("This file exists twice: a fixed-layout ") + .bold("PDF") + .plain(" and an editable ") + .bold("DOCX") + .plain(" exported from the same session. Inline runs — ") + .italic("italic, ") + .color("colored, ", GOLD) + .accent("bold accents", TEAL) + .plain(" — survive in both.")) + + .addParagraph("Lists keep markers and indent", heading) + .addList(list -> list + .name("FlatList") + .textStyle(body) + .dash() + .items("Flat items use the list marker", + "Word gets one paragraph per item")) + .addList(list -> list + .name("NestedList") + .textStyle(body) + .itemSpacing(2) + .markerFor(1, ListMarker.custom("◦")) + .markerFor(2, ListMarker.custom("▪")) + .addItem("Nested authoring", l1 -> l1 + .addItem("Two spaces of indent per depth in Word", l2 -> l2 + .addItem("Custom markers survive the export")))) + + .addParagraph("Tables stay tables", heading) + .addTable(t -> t + .columns(DocumentTableColumn.auto(), + DocumentTableColumn.auto(), + DocumentTableColumn.auto()) + .headerRow("Quarter", "Revenue", "Profit") + .row("Q1", "42", "12") + .row("Q2", "55", "17") + .row("Q3", "61", "21") + .row("Q4", "70", "26")) + + .addParagraph("Side-by-side rows become one-row tables", heading) + .addRow(r -> r.spacing(14).weights(1, 1) + .addSection("Left", a -> a + .addParagraph("Left cell — editors keep the columns.", body)) + .addSection("Right", b -> b + .addParagraph("Right cell — content stays editable.", body))) + + .addParagraph("Images embed at their declared size", heading) + .addImage(i -> i.source(photo).size(180, 100)) + + .addPageBreak(pb -> pb.name("ToPage2")) + + .addParagraph("Charts fall back to their data", heading) + .addParagraph("The PDF renders the vector chart; Word has no layout pass, " + + "so the same node exports as a categories-by-series table.", caption) + .addSection("Chart", s -> s.chart(ChartSpec.bar().data(quarters).build())) + + .addParagraph("Geometry stays PDF-only by design", heading) + .addParagraph("The divider and the badge below render in the PDF; the " + + "semantic export skips pure geometry and writes the badge's " + + "text inline instead.", caption) + .addDivider(d -> d.width(420).thickness(2).color(GOLD)) + .addCircle(72, TEAL, c -> c + .stroke(DocumentStroke.of(GOLD, 1.2)) + .center(new com.demcha.compose.document.dsl.ParagraphBuilder() + .text("GC") + .textStyle(DocumentTextStyle.builder() + .fontName(FontName.HELVETICA_BOLD).size(20) + .color(DocumentColor.WHITE).build()) + .align(com.demcha.compose.document.node.TextAlign.CENTER) + .build())) + .build(); + + document.buildPdf(); + document.export(new DocxSemanticBackend(), docxFile); + } + System.out.println("Generated: " + docxFile); + return pdfFile; + } + + /** + * Small deterministic gradient placeholder (a few KB) — keeps the + * committed PDF/DOCX previews light, unlike the 1.8 MB catalog photo. + */ + private static DocumentImageData demoImage() throws Exception { + BufferedImage image = new BufferedImage(360, 200, BufferedImage.TYPE_INT_RGB); + Graphics2D g = image.createGraphics(); + try { + g.setPaint(new GradientPaint(0, 0, new Color(20, 45, 80), + 360, 200, new Color(20, 80, 95))); + g.fillRect(0, 0, 360, 200); + g.setPaint(new Color(196, 153, 76)); + g.setStroke(new BasicStroke(6f)); + g.drawLine(0, 170, 360, 110); + } finally { + g.dispose(); + } + ByteArrayOutputStream png = new ByteArrayOutputStream(); + ImageIO.write(image, "png", png); + return DocumentImageData.fromBytes(png.toByteArray()); + } + + public static void main(String[] args) throws Exception { + Path output = generate(); + System.out.println("Generated: " + output); + } +} diff --git a/examples/src/main/java/com/demcha/examples/support/ShowcaseMetadata.java b/examples/src/main/java/com/demcha/examples/support/ShowcaseMetadata.java index 3aec5fe1b..8243582e3 100644 --- a/examples/src/main/java/com/demcha/examples/support/ShowcaseMetadata.java +++ b/examples/src/main/java/com/demcha/examples/support/ShowcaseMetadata.java @@ -103,6 +103,7 @@ record Entry(String title, String description, List tags, String codeUrl feature("chrome", "pdf-chrome", "PDF Chrome", "Headers, footers, watermarks, metadata, document protection / encryption.", "chrome", "metadata", "watermark"); feature("streaming", "invoice-http-stream", "HTTP Streaming", "Stream PDF directly to a Servlet response with no buffering.", "streaming", "http"); feature("snapshots", "invoice-snapshot-regression", "Layout Snapshots", "How LayoutSnapshotAssertions captures the resolved layout graph for regression testing.", "snapshots", "testing"); + feature("docx", "word-export-companion", "Word Export (DOCX)", "DocxSemanticBackend — the same document as a fixed-layout PDF and an editable Word file; charts fall back to their data table.", "docx", "word", "export"); // ===== Flagships ===== flagship("master-showcase", "Master Showcase", "Kitchen-sink demo combining every primitive into a single document — the full GraphCompose surface.", "showcase"); @@ -206,6 +207,7 @@ private static void feature(String group, String id, String title, String desc, case "chrome" -> "chrome/PdfChromeExample.java"; case "streaming" -> "streaming/HttpStreamingExample.java"; case "snapshots" -> "snapshots/LayoutSnapshotRegressionExample.java"; + case "docx" -> "docx/WordExportExample.java"; default -> group + "/" + capitalize(id); }; ENTRIES.put(id, entry(title, desc, withCategory(group, tags), EX_BASE + "/features/" + file)); diff --git a/pom.xml b/pom.xml index 0a575f8f1..1f773f121 100644 --- a/pom.xml +++ b/pom.xml @@ -203,24 +203,6 @@ jackson-databind - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - true - - com.google.zxing core @@ -728,6 +710,16 @@ japicmp baseline advances to the release that lands the change. --> com.demcha.compose.engine.measurement.TextMeasurementSystem + + com.demcha.compose.ConfigLoader diff --git a/src/main/java/com/demcha/compose/ConfigLoader.java b/src/main/java/com/demcha/compose/ConfigLoader.java deleted file mode 100644 index c40475ab2..000000000 --- a/src/main/java/com/demcha/compose/ConfigLoader.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.demcha.compose; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import lombok.extern.slf4j.Slf4j; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -@Slf4j -public final class ConfigLoader { - - - private ConfigLoader() { - } - - /** - * Load YAML or JSON from a classpath resource into the given class. - * Supports running from IDE and from a fat JAR. - * Optionally resolves {@code ${ENV}} or {@code ${ENV:default}} placeholders - * from environment variables. - * - *

Optional dependency: the YAML path requires - * {@code com.fasterxml.jackson.dataformat:jackson-dataformat-yaml} on - * the classpath. GraphCompose declares it as an optional Maven - * dependency since {@code v1.6.7}; applications that load YAML - * configs through this helper must add the artifact to their own - * build. JSON configs work without it. - * - * @throws java.lang.NoClassDefFoundError if {@code fileName} ends with - * {@code .yaml} / {@code .yml} and - * {@code jackson-dataformat-yaml} is not on the classpath. - */ - public static T loadConfigWithEnv(String fileName, Class clazz, boolean resolveEnv) { - log.info("Initializing variables from '{}'", fileName); - ObjectMapper mapper; - if (fileName == null || fileName.isBlank()) throw new RuntimeException("fileName can`t be null or blank"); - - if (fileName.endsWith("yaml") || fileName.endsWith("yml")) { - mapper = new ObjectMapper(new YAMLFactory()); - } else { - mapper = new ObjectMapper(); - - } - - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - if (cl == null) cl = ConfigLoader.class.getClassLoader(); - - URL resource = cl.getResource(fileName); - if (resource == null) { - throw new IllegalArgumentException("Config resource not found on classpath: " + fileName + "Url: " + resource); - } - log.info("Reading config from '{}'", resource); - - String raw; - try (InputStream is = resource.openStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { - - StringBuilder sb = new StringBuilder(); - String line; - while ((line = br.readLine()) != null) sb.append(line).append('\n'); - raw = sb.toString(); - } catch (Exception e) { - log.error("Failed to read config '{}': {}", fileName, e.toString(), e); - throw new RuntimeException("Failed to read config: " + fileName, e); - } - - String resolved = resolveEnv ? replaceEnvVariables(raw) : raw; - - - log.info("Creating a config YAML object '{}'", clazz.getSimpleName()); - try { - log.info("Parsing config '{}'", fileName); - return mapper.readValue(resolved, clazz); - } catch (JsonProcessingException e) { - log.error("Failed to parse config '{}': {}", fileName, e.toString(), e); - throw new RuntimeException( "Failed to parse config: " + fileName, e); - } - } - - /** - * Replace ${ENV} or ${ENV:default} with values from SystemECS.getenv(). - * Unknown vars without default → empty string. - */ - private static String replaceEnvVariables(String text) { - // ${VAR} or ${VAR:default value} - Pattern p = Pattern.compile("\\$\\{([A-Za-z_][A-Za-z0-9_]*) (?:: ([^}]*))?\\}", Pattern.COMMENTS); - Matcher m = p.matcher(text); - StringBuffer out = new StringBuffer(); - - while (m.find()) { - String var = m.group(1); - String def = m.group(2); // may be null - String val = System.getenv(var); - if (val == null) val = (def != null ? def : ""); - // Escape backslashes and dollars for appendReplacement - m.appendReplacement(out, Matcher.quoteReplacement(val)); - } - m.appendTail(out); - return out.toString(); - } -} diff --git a/src/main/java/com/demcha/compose/GraphCompose.java b/src/main/java/com/demcha/compose/GraphCompose.java index a9841ae97..f20ba3ca7 100644 --- a/src/main/java/com/demcha/compose/GraphCompose.java +++ b/src/main/java/com/demcha/compose/GraphCompose.java @@ -15,6 +15,7 @@ /** * Main entry point for GraphCompose document authoring. + * *

* Application code starts here and should use the canonical semantic document * session through {@link #document()} to turn author intent into a paginated @@ -23,18 +24,18 @@ * *

The typical runtime flow is:

*
    - *
  1. create a semantic session with {@link #document(Path)} or {@link #document()}
    2. - *
  2. author content with {@link DocumentSession#pageFlow()}, {@link DocumentSession#compose(java.util.function.Consumer)}, - * or {@link DocumentSession#dsl()}
    3. - *
  3. inspect {@link DocumentSession#layoutGraph()} or {@link DocumentSession#layoutSnapshot()} if needed
    4. - *
  4. call {@link DocumentSession#buildPdf()} or {@link DocumentSession#toPdfBytes()}
    5. + *
  5. Create a semantic session with {@link #document(Path)} or {@link #document()}.
    6. + *
  6. Author content with {@link DocumentSession#pageFlow()}, + * {@link DocumentSession#compose(java.util.function.Consumer)}, or + * {@link DocumentSession#dsl()}.
    7. + *
  7. Inspect {@link DocumentSession#layoutGraph()} or + * {@link DocumentSession#layoutSnapshot()} if needed.
    8. + *
  8. Call {@link DocumentSession#buildPdf()} or {@link DocumentSession#toPdfBytes()}.
    9. *
* - * @author Artem Demchyshyn - * @since 1.0.0 - * *

Build a PDF file with the canonical DSL

- * 
+ *
+ * 
{@code
  * try (DocumentSession document = GraphCompose.document(outputFile)
  *         .pageSize(DocumentPageSize.A4)
  *         .margin(24, 24, 24, 24)
@@ -45,10 +46,11 @@
  *
  *     document.buildPdf();
  * }
- * 

+ * }
* *

Get bytes instead of writing to disk

- * 
+ *
+ * 
{@code
  * try (DocumentSession document = GraphCompose.document()
  *         .pageSize(DocumentPageSize.A4)
  *         .create()) {
@@ -58,7 +60,10 @@
  *
  *     byte[] pdfBytes = document.toPdfBytes();
  * }
- * 

+ * }
+ * + * @author Artem Demchyshyn + * @since 1.0.0 */ public final class GraphCompose { diff --git a/src/main/java/com/demcha/compose/document/api/DocumentChromeOptions.java b/src/main/java/com/demcha/compose/document/api/DocumentChromeOptions.java index 96846e5a6..49f618a2e 100644 --- a/src/main/java/com/demcha/compose/document/api/DocumentChromeOptions.java +++ b/src/main/java/com/demcha/compose/document/api/DocumentChromeOptions.java @@ -2,17 +2,8 @@ import com.demcha.compose.document.backend.fixed.pdf.PdfFixedLayoutBackend; import com.demcha.compose.document.backend.fixed.pdf.PdfOutputOptionsTranslator; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterZone; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfMetadataOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfProtectionOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkOptions; -import com.demcha.compose.document.output.DocumentHeaderFooter; -import com.demcha.compose.document.output.DocumentHeaderFooterZone; -import com.demcha.compose.document.output.DocumentMetadata; -import com.demcha.compose.document.output.DocumentOutputOptions; -import com.demcha.compose.document.output.DocumentProtection; -import com.demcha.compose.document.output.DocumentWatermark; +import com.demcha.compose.document.backend.fixed.pdf.options.*; +import com.demcha.compose.document.output.*; import java.util.ArrayList; import java.util.List; @@ -41,10 +32,10 @@ * @author Artem Demchyshyn */ final class DocumentChromeOptions { + private final List headersAndFooters = new ArrayList<>(); private DocumentMetadata metadata; private DocumentWatermark watermark; private DocumentProtection protection; - private final List headersAndFooters = new ArrayList<>(); DocumentChromeOptions() { } @@ -79,13 +70,13 @@ void clearHeadersAndFooters() { * Indicates whether at least one chrome option is configured. * * @return {@code true} when the session has metadata / watermark / - * protection / repeating chrome attached + * protection / repeating chrome attached */ boolean isEmpty() { return metadata == null - && watermark == null - && protection == null - && headersAndFooters.isEmpty(); + && watermark == null + && protection == null + && headersAndFooters.isEmpty(); } /** diff --git a/src/main/java/com/demcha/compose/document/api/DocumentPageSize.java b/src/main/java/com/demcha/compose/document/api/DocumentPageSize.java index 7858f45b3..a4d3fd78b 100644 --- a/src/main/java/com/demcha/compose/document/api/DocumentPageSize.java +++ b/src/main/java/com/demcha/compose/document/api/DocumentPageSize.java @@ -6,7 +6,7 @@ *

The values are deliberately plain geometry. PDFBox-specific page objects * are created only by the PDF backend when a document is rendered.

* - * @param width page width in points + * @param width page width in points * @param height page height in points * @since 1.0.0 */ @@ -29,7 +29,7 @@ public record DocumentPageSize(double width, double height) { /** * Creates a page size from point dimensions. * - * @param width page width in points + * @param width page width in points * @param height page height in points */ public DocumentPageSize { @@ -44,7 +44,7 @@ public record DocumentPageSize(double width, double height) { /** * Creates a page size from point dimensions. * - * @param width page width in points + * @param width page width in points * @param height page height in points * @return page size value */ diff --git a/src/main/java/com/demcha/compose/document/api/DocumentRenderingFacade.java b/src/main/java/com/demcha/compose/document/api/DocumentRenderingFacade.java index 117f91da4..fc1db5beb 100644 --- a/src/main/java/com/demcha/compose/document/api/DocumentRenderingFacade.java +++ b/src/main/java/com/demcha/compose/document/api/DocumentRenderingFacade.java @@ -42,6 +42,10 @@ final class DocumentRenderingFacade { this.context = Objects.requireNonNull(context, "context"); } + private static long elapsedMillis(long startNanos) { + return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos); + } + R render(FixedLayoutBackend backend, Path outputFile) throws Exception { context.ensureOpen(); Objects.requireNonNull(backend, "backend"); @@ -170,10 +174,6 @@ void buildPdf(Path outputFile) throws Exception { } } - private static long elapsedMillis(long startNanos) { - return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos); - } - /** * Context callbacks that the rendering facade reads from * {@link DocumentSession}. The session implements this interface so the diff --git a/src/main/java/com/demcha/compose/document/api/DocumentSession.java b/src/main/java/com/demcha/compose/document/api/DocumentSession.java index 869dacb78..548099e85 100644 --- a/src/main/java/com/demcha/compose/document/api/DocumentSession.java +++ b/src/main/java/com/demcha/compose/document/api/DocumentSession.java @@ -1,34 +1,30 @@ package com.demcha.compose.document.api; import com.demcha.compose.GraphCompose; -import com.demcha.compose.font.FontFamilyDefinition; import com.demcha.compose.document.backend.fixed.FixedLayoutBackend; -import com.demcha.compose.document.backend.fixed.pdf.PdfMeasurementResources; import com.demcha.compose.document.backend.fixed.pdf.PdfFixedLayoutBackend; +import com.demcha.compose.document.backend.fixed.pdf.PdfMeasurementResources; import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterOptions; import com.demcha.compose.document.backend.fixed.pdf.options.PdfMetadataOptions; import com.demcha.compose.document.backend.fixed.pdf.options.PdfProtectionOptions; import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkOptions; import com.demcha.compose.document.backend.semantic.SemanticBackend; -import com.demcha.compose.document.output.DocumentHeaderFooter; -import com.demcha.compose.document.output.DocumentMetadata; -import com.demcha.compose.document.output.DocumentOutputOptions; -import com.demcha.compose.document.output.DocumentProtection; -import com.demcha.compose.document.output.DocumentWatermark; import com.demcha.compose.document.debug.snapshot.LayoutGraphSnapshotExtractor; import com.demcha.compose.document.dsl.DocumentDsl; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.exceptions.DocumentRenderingException; import com.demcha.compose.document.layout.*; -import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.ContainerNode; +import com.demcha.compose.document.node.DocumentNode; +import com.demcha.compose.document.output.*; import com.demcha.compose.document.snapshot.LayoutSnapshot; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; +import com.demcha.compose.font.FontFamilyDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.awt.Color; +import java.awt.*; import java.io.OutputStream; import java.nio.file.Path; import java.util.ArrayList; @@ -70,32 +66,28 @@ public final class DocumentSession implements AutoCloseable { private final LayoutCompiler compiler; private final List roots = new ArrayList<>(); private final List customFontFamilies = new ArrayList<>(); - + private final DocumentChromeOptions chromeOptions = new DocumentChromeOptions(); + private final DocumentLayoutCache layoutCache = new DocumentLayoutCache(); + private final DocumentRenderingFacade renderingFacade = new DocumentRenderingFacade(new RenderingContextImpl()); private DocumentPageSize pageSize; private DocumentInsets margin; private LayoutCanvas canvas; private boolean markdown; private boolean guideLines; private List pageBackgrounds = List.of(); - - private final DocumentChromeOptions chromeOptions = new DocumentChromeOptions(); - private PdfMeasurementResources measurementResources; - - private final DocumentLayoutCache layoutCache = new DocumentLayoutCache(); - private final DocumentRenderingFacade renderingFacade = new DocumentRenderingFacade(new RenderingContextImpl()); private boolean closed; /** * Creates a canonical document session. * - * @param defaultOutputFile optional default PDF output path - * @param pageSize physical page size - * @param margin page margin + * @param defaultOutputFile optional default PDF output path + * @param pageSize physical page size + * @param margin page margin * @param customFontFamilies document-local font families - * @param markdown whether markdown parsing is enabled - * @param guideLines whether PDF guide-line overlays are enabled + * @param markdown whether markdown parsing is enabled + * @param guideLines whether PDF guide-line overlays are enabled */ public DocumentSession(Path defaultOutputFile, DocumentPageSize pageSize, @@ -124,6 +116,23 @@ public DocumentSession(Path defaultOutputFile, guideLines); } + /** + * Runs a PDF convenience body and unifies the cross-cutting checked-exception + * wrapping: any underlying {@link Exception} is rewrapped as + * {@link DocumentRenderingException} with the supplied {@code action} fragment. + * {@link RuntimeException}s pass through unchanged so existing callers that + * already catch them keep their semantics. + */ + private static R wrapPdfRendering(String action, PdfRenderingBody body) throws DocumentRenderingException { + try { + return body.run(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new DocumentRenderingException("Failed to " + action + ": " + e.getMessage(), e); + } + } + /** * Returns the fluent semantic DSL facade bound to this session. * @@ -141,8 +150,8 @@ public DocumentDsl dsl() { * @return a new DSL facade for authoring roots and semantic nodes * @throws IllegalStateException if this session has already been closed * @deprecated since 1.6.0; prefer {@link #dsl()}. Carrying two names for - * the same operation on the session facade adds maintenance - * cost without clarity. Scheduled for removal in v2.0. + * the same operation on the session facade adds maintenance + * cost without clarity. Scheduled for removal in v2.0. */ @Deprecated(since = "1.6.0", forRemoval = true) public DocumentDsl builder() { @@ -256,7 +265,7 @@ public DocumentSession pageSize(DocumentPageSize pageSize) { /** * Updates the physical page size from point dimensions. * - * @param width page width in points + * @param width page width in points * @param height page height in points * @return this session */ @@ -408,7 +417,7 @@ public DocumentSession metadata(DocumentMetadata metadata) { * @param options legacy PDF metadata options, or {@code null} to clear * @return this session * @deprecated since 1.6.0, removal in v2.0; prefer the canonical - * {@link #metadata(DocumentMetadata)}. + * {@link #metadata(DocumentMetadata)}. */ @Deprecated(since = "1.6.0", forRemoval = true) public DocumentSession metadata(PdfMetadataOptions options) { @@ -435,7 +444,7 @@ public DocumentSession watermark(DocumentWatermark watermark) { * @param options legacy PDF watermark options, or {@code null} to clear * @return this session * @deprecated since 1.6.0, removal in v2.0; prefer the canonical - * {@link #watermark(DocumentWatermark)}. + * {@link #watermark(DocumentWatermark)}. */ @Deprecated(since = "1.6.0", forRemoval = true) public DocumentSession watermark(PdfWatermarkOptions options) { @@ -462,7 +471,7 @@ public DocumentSession protect(DocumentProtection protection) { * @param options legacy PDF protection options, or {@code null} to clear * @return this session * @deprecated since 1.6.0, removal in v2.0; prefer the canonical - * {@link #protect(DocumentProtection)}. + * {@link #protect(DocumentProtection)}. */ @Deprecated(since = "1.6.0", forRemoval = true) public DocumentSession protect(PdfProtectionOptions options) { @@ -488,7 +497,7 @@ public DocumentSession header(DocumentHeaderFooter header) { * @param options legacy PDF header/footer options * @return this session * @deprecated since 1.6.0, removal in v2.0; prefer the canonical - * {@link #header(DocumentHeaderFooter)}. + * {@link #header(DocumentHeaderFooter)}. */ @Deprecated(since = "1.6.0", forRemoval = true) public DocumentSession header(PdfHeaderFooterOptions options) { @@ -514,7 +523,7 @@ public DocumentSession footer(DocumentHeaderFooter footer) { * @param options legacy PDF header/footer options * @return this session * @deprecated since 1.6.0, removal in v2.0; prefer the canonical - * {@link #footer(DocumentHeaderFooter)}. + * {@link #footer(DocumentHeaderFooter)}. */ @Deprecated(since = "1.6.0", forRemoval = true) public DocumentSession footer(PdfHeaderFooterOptions options) { @@ -557,7 +566,7 @@ public DocumentSession registerFontFamily(FontFamilyDefinition definition) { * mutations through {@code invalidate()} since v1.6.7). * * @param definition node definition implementation - * @param semantic node type handled by the definition + * @param semantic node type handled by the definition * @return this session * @throws IllegalStateException if this session has already been closed */ @@ -712,7 +721,7 @@ public LayoutSnapshot layoutSnapshot() { * Renders the current layout graph with the supplied fixed-layout backend. * * @param backend backend implementation that consumes the resolved layout graph - * @param backend-specific result type + * @param backend-specific result type * @return backend render result * @throws Exception if rendering fails */ @@ -723,9 +732,9 @@ public R render(FixedLayoutBackend backend) throws Exception { /** * Renders the current layout graph with an explicit output target override. * - * @param backend backend implementation that consumes the resolved layout graph + * @param backend backend implementation that consumes the resolved layout graph * @param outputFile optional output target for backends that persist to disk - * @param backend-specific result type + * @param backend-specific result type * @return backend render result * @throws Exception if rendering fails */ @@ -737,7 +746,7 @@ public R render(FixedLayoutBackend backend, Path outputFile) throws Excep * Exports the semantic graph through a semantic backend using the default output file. * * @param backend semantic backend implementation - * @param backend-specific result type + * @param backend-specific result type * @return export result * @throws Exception if export fails */ @@ -748,9 +757,9 @@ public R export(SemanticBackend backend) throws Exception { /** * Exports the semantic graph through a semantic backend using an explicit output target. * - * @param backend semantic backend implementation + * @param backend semantic backend implementation * @param outputFile optional output file override - * @param backend-specific result type + * @param backend-specific result type * @return export result * @throws Exception if export fails */ @@ -793,7 +802,7 @@ public void writePdf(OutputStream output) throws DocumentRenderingException { /** * Builds the current document into the default output file configured on the builder. * - * @throws IllegalStateException if no default output file was configured + * @throws IllegalStateException if no default output file was configured * @throws DocumentRenderingException if PDF rendering fails */ public void buildPdf() throws DocumentRenderingException { @@ -912,23 +921,6 @@ private long elapsedMillis(long startNanos) { return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos); } - /** - * Runs a PDF convenience body and unifies the cross-cutting checked-exception - * wrapping: any underlying {@link Exception} is rewrapped as - * {@link DocumentRenderingException} with the supplied {@code action} fragment. - * {@link RuntimeException}s pass through unchanged so existing callers that - * already catch them keep their semantics. - */ - private static R wrapPdfRendering(String action, PdfRenderingBody body) throws DocumentRenderingException { - try { - return body.run(); - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new DocumentRenderingException("Failed to " + action + ": " + e.getMessage(), e); - } - } - @FunctionalInterface private interface PdfRenderingBody { R run() throws Exception; diff --git a/src/main/java/com/demcha/compose/document/api/Internal.java b/src/main/java/com/demcha/compose/document/api/Internal.java index c9e97884e..8e9608fac 100644 --- a/src/main/java/com/demcha/compose/document/api/Internal.java +++ b/src/main/java/com/demcha/compose/document/api/Internal.java @@ -1,10 +1,6 @@ package com.demcha.compose.document.api; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Marks an API element as internal to GraphCompose. diff --git a/src/main/java/com/demcha/compose/document/api/PageBackgroundFill.java b/src/main/java/com/demcha/compose/document/api/PageBackgroundFill.java index f6991ad48..cb30a61d3 100644 --- a/src/main/java/com/demcha/compose/document/api/PageBackgroundFill.java +++ b/src/main/java/com/demcha/compose/document/api/PageBackgroundFill.java @@ -52,7 +52,9 @@ public record PageBackgroundFill(double xRatio, double heightRatio, DocumentColor color) { - /** Validates the ratio bounds and that the fill color is non-null. */ + /** + * Validates the ratio bounds and that the fill color is non-null. + */ public PageBackgroundFill { Objects.requireNonNull(color, "color"); if (xRatio < 0.0 || xRatio > 1.0) { @@ -87,7 +89,7 @@ public static PageBackgroundFill fullPage(DocumentColor color) { * Full-height column at the left page edge, with width = ratio of page width. * * @param widthRatio width as a fraction of the canvas width (0..1] - * @param color fill color (required) + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page height at the left edge */ public static PageBackgroundFill leftColumn(double widthRatio, @@ -99,7 +101,7 @@ public static PageBackgroundFill leftColumn(double widthRatio, * Full-height column at the right page edge, with width = ratio of page width. * * @param widthRatio width as a fraction of the canvas width (0..1] - * @param color fill color (required) + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page height at the right edge */ public static PageBackgroundFill rightColumn(double widthRatio, @@ -111,9 +113,9 @@ public static PageBackgroundFill rightColumn(double widthRatio, /** * Full-height column at an arbitrary horizontal offset. * - * @param xRatio left edge of the column: 0.0 = left edge, 1.0 = right edge + * @param xRatio left edge of the column: 0.0 = left edge, 1.0 = right edge * @param widthRatio width as a fraction of the canvas width (0..1] - * @param color fill color (required) + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page height from {@code xRatio} */ public static PageBackgroundFill column(double xRatio, @@ -126,7 +128,7 @@ public static PageBackgroundFill column(double xRatio, * Full-width band flush with the top of the page (height = ratio of page height). * * @param heightRatio height as a fraction of the canvas height (0..1] - * @param color fill color (required) + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page width at the top edge */ public static PageBackgroundFill topBand(double heightRatio, @@ -138,7 +140,7 @@ public static PageBackgroundFill topBand(double heightRatio, * Full-width band flush with the bottom of the page (height = ratio of page height). * * @param heightRatio height as a fraction of the canvas height (0..1] - * @param color fill color (required) + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page width at the bottom edge */ public static PageBackgroundFill bottomBand(double heightRatio, @@ -151,8 +153,8 @@ public static PageBackgroundFill bottomBand(double heightRatio, * Full-width band whose top edge sits {@code yRatioFromTop} down the page (0.0 = page top). * * @param yRatioFromTop top edge of the band: 0.0 = page top, 1.0 = page bottom - * @param heightRatio height as a fraction of the canvas height (0..1] - * @param color fill color (required) + * @param heightRatio height as a fraction of the canvas height (0..1] + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page width from {@code yRatioFromTop} */ public static PageBackgroundFill band(double yRatioFromTop, @@ -166,8 +168,8 @@ public static PageBackgroundFill band(double yRatioFromTop, * Top-aligned band sized in absolute points, converted against {@code pageHeight}. * * @param heightPoints band height in points - * @param pageHeight reference page height in points used to convert points to a ratio - * @param color fill color (required) + * @param pageHeight reference page height in points used to convert points to a ratio + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page width at the top edge */ public static PageBackgroundFill topBandPoints(double heightPoints, @@ -180,9 +182,9 @@ public static PageBackgroundFill topBandPoints(double heightPoints, * Band positioned and sized in absolute points from the page top, converted against {@code pageHeight}. * * @param yFromTopPoints offset of the band top edge from the page top in points - * @param heightPoints band height in points - * @param pageHeight reference page height in points used to convert points to ratios - * @param color fill color (required) + * @param heightPoints band height in points + * @param pageHeight reference page height in points used to convert points to ratios + * @param color fill color (required) * @return a {@code PageBackgroundFill} spanning the full page width from {@code yFromTopPoints} */ public static PageBackgroundFill bandPoints(double yFromTopPoints, diff --git a/src/main/java/com/demcha/compose/document/api/PdfOutputOptionsToCanonical.java b/src/main/java/com/demcha/compose/document/api/PdfOutputOptionsToCanonical.java index 6b3046cb2..80ba70b97 100644 --- a/src/main/java/com/demcha/compose/document/api/PdfOutputOptionsToCanonical.java +++ b/src/main/java/com/demcha/compose/document/api/PdfOutputOptionsToCanonical.java @@ -1,17 +1,7 @@ package com.demcha.compose.document.api; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterZone; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfProtectionOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkLayer; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkPosition; -import com.demcha.compose.document.output.DocumentHeaderFooter; -import com.demcha.compose.document.output.DocumentHeaderFooterZone; -import com.demcha.compose.document.output.DocumentProtection; -import com.demcha.compose.document.output.DocumentWatermark; -import com.demcha.compose.document.output.DocumentWatermarkLayer; -import com.demcha.compose.document.output.DocumentWatermarkPosition; +import com.demcha.compose.document.backend.fixed.pdf.options.*; +import com.demcha.compose.document.output.*; import com.demcha.compose.document.style.DocumentColor; /** diff --git a/src/main/java/com/demcha/compose/document/api/SessionFontApi.java b/src/main/java/com/demcha/compose/document/api/SessionFontApi.java index 9fb9c440c..fec73b7c0 100644 --- a/src/main/java/com/demcha/compose/document/api/SessionFontApi.java +++ b/src/main/java/com/demcha/compose/document/api/SessionFontApi.java @@ -65,7 +65,7 @@ public SessionFontApi registerFamily(FontFamilyDefinition definition) { * {@link DocumentSession#registerNodeDefinition(NodeDefinition)}. * * @param definition node definition implementation - * @param semantic node type handled by the definition + * @param semantic node type handled by the definition * @return this facade for chaining * @throws IllegalStateException if the owning session has already been closed */ diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutBackend.java b/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutBackend.java index d0c1d4895..10025c70b 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutBackend.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutBackend.java @@ -19,7 +19,7 @@ public interface FixedLayoutBackend { /** * Renders one resolved layout graph. * - * @param graph resolved graph emitted by the semantic compiler + * @param graph resolved graph emitted by the semantic compiler * @param context render-pass configuration and output target * @return backend-specific render result * @throws Exception if rendering fails diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutRenderContext.java b/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutRenderContext.java index 3e50fecb9..ff4c3ce38 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutRenderContext.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/FixedLayoutRenderContext.java @@ -14,10 +14,10 @@ *

The context carries only document-wide render configuration. Backends must * treat it as read-only and derive any mutable render-pass state from it.

* - * @param canvas physical page canvas used by the resolved layout graph + * @param canvas physical page canvas used by the resolved layout graph * @param customFontFamilies document-local font families available to the backend - * @param outputFile optional file target for backends that persist artifacts to disk - * @param outputStream optional caller-owned stream target for streaming render output + * @param outputFile optional file target for backends that persist artifacts to disk + * @param outputStream optional caller-owned stream target for streaming render output */ public record FixedLayoutRenderContext( LayoutCanvas canvas, diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfDocumentPostProcessor.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfDocumentPostProcessor.java index ce03a2c33..53d95700f 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfDocumentPostProcessor.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfDocumentPostProcessor.java @@ -34,11 +34,11 @@ private PdfDocumentPostProcessor() { * Applies canonical document-level PDF options to an already rendered * PDFBox document in place. * - * @param document target PDFBox document - * @param canvas semantic layout canvas used to derive content margins - * @param metadataOptions canonical metadata options, or {@code null} - * @param watermarkOptions canonical watermark options, or {@code null} - * @param protectionOptions canonical protection options, or {@code null} + * @param document target PDFBox document + * @param canvas semantic layout canvas used to derive content margins + * @param metadataOptions canonical metadata options, or {@code null} + * @param watermarkOptions canonical watermark options, or {@code null} + * @param protectionOptions canonical protection options, or {@code null} * @param headerFooterOptions repeating header/footer options * @throws IOException if PDFBox post-processing fails */ @@ -94,11 +94,11 @@ public static void apply(PDDocument document, * Applies canonical document-level PDF options to already rendered PDF bytes * and returns a new byte array. * - * @param pdfBytes rendered PDF bytes - * @param canvas semantic layout canvas used to derive content margins - * @param metadataOptions canonical metadata options, or {@code null} - * @param watermarkOptions canonical watermark options, or {@code null} - * @param protectionOptions canonical protection options, or {@code null} + * @param pdfBytes rendered PDF bytes + * @param canvas semantic layout canvas used to derive content margins + * @param metadataOptions canonical metadata options, or {@code null} + * @param watermarkOptions canonical watermark options, or {@code null} + * @param protectionOptions canonical protection options, or {@code null} * @param headerFooterOptions repeating header/footer options * @return post-processed PDF bytes * @throws IOException if the PDF cannot be loaded or post-processed @@ -121,9 +121,9 @@ public static byte[] apply(byte[] pdfBytes, /** * Returns {@code true} when any document-level post-processing option is set. * - * @param metadataOptions canonical metadata options, or {@code null} - * @param watermarkOptions canonical watermark options, or {@code null} - * @param protectionOptions canonical protection options, or {@code null} + * @param metadataOptions canonical metadata options, or {@code null} + * @param watermarkOptions canonical watermark options, or {@code null} + * @param protectionOptions canonical protection options, or {@code null} * @param headerFooterOptions repeating header/footer options * @return {@code true} when post-processing work is required */ @@ -132,9 +132,9 @@ public static boolean hasPostProcessing(PdfMetadataOptions metadataOptions, PdfProtectionOptions protectionOptions, Collection headerFooterOptions) { return metadataOptions != null - || watermarkOptions != null - || protectionOptions != null - || (headerFooterOptions != null && !headerFooterOptions.isEmpty()); + || watermarkOptions != null + || protectionOptions != null + || (headerFooterOptions != null && !headerFooterOptions.isEmpty()); } private static void applyProtection(PDDocument document, PdfProtectionOptions options) throws IOException { diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFixedLayoutBackend.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFixedLayoutBackend.java index 39254ff3e..f5dfdecca 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFixedLayoutBackend.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFixedLayoutBackend.java @@ -2,35 +2,12 @@ import com.demcha.compose.document.backend.fixed.FixedLayoutBackend; import com.demcha.compose.document.backend.fixed.FixedLayoutRenderContext; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfBarcodeFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfEllipseFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfPolygonFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfImageFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfLineFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfParagraphFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfShapeClipBeginRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfShapeClipEndRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfShapeFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfTableRowFragmentRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfTransformBeginRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.handlers.PdfTransformEndRenderHandler; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterZone; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfMetadataOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfProtectionOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkOptions; +import com.demcha.compose.document.backend.fixed.pdf.handlers.*; +import com.demcha.compose.document.backend.fixed.pdf.options.*; import com.demcha.compose.document.exceptions.UnsupportedNodeCapabilityException; import com.demcha.compose.document.layout.LayoutGraph; import com.demcha.compose.document.layout.PlacedFragment; -import com.demcha.compose.document.layout.payloads.BarcodeFragmentPayload; -import com.demcha.compose.document.layout.payloads.ImageFragmentPayload; -import com.demcha.compose.document.layout.payloads.ParagraphFragmentPayload; -import com.demcha.compose.document.layout.payloads.ParagraphImageSpan; -import com.demcha.compose.document.layout.payloads.ParagraphLine; -import com.demcha.compose.document.layout.payloads.ParagraphSpan; -import com.demcha.compose.document.layout.payloads.PdfSemanticFragmentPayload; -import com.demcha.compose.document.layout.payloads.ShapeFragmentPayload; -import com.demcha.compose.document.layout.payloads.TableRowFragmentPayload; +import com.demcha.compose.document.layout.payloads.*; import com.demcha.compose.font.FontLibrary; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -41,12 +18,7 @@ import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.nio.file.Files; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.TimeUnit; /** @@ -81,6 +53,31 @@ public PdfFixedLayoutBackend() { this(defaultHandlers(), false, null, null, null, List.of()); } + PdfFixedLayoutBackend(Collection> handlers) { + this(handlers, false, null, null, null, List.of()); + } + + private PdfFixedLayoutBackend(Collection> handlers, + boolean guideLines, + PdfMetadataOptions metadataOptions, + PdfWatermarkOptions watermarkOptions, + PdfProtectionOptions protectionOptions, + Collection headerFooterOptions) { + Map, PdfFragmentRenderHandler> registry = new LinkedHashMap<>(); + for (PdfFragmentRenderHandler handler : handlers) { + PdfFragmentRenderHandler previous = registry.put(handler.payloadType(), Objects.requireNonNull(handler, "handler")); + if (previous != null) { + throw new IllegalArgumentException("Duplicate PDF handler for payload type " + handler.payloadType().getName()); + } + } + this.handlers = Map.copyOf(registry); + this.guideLines = guideLines; + this.metadataOptions = metadataOptions; + this.watermarkOptions = watermarkOptions; + this.protectionOptions = protectionOptions; + this.headerFooterOptions = List.copyOf(headerFooterOptions); + } + /** * Returns a builder for PDF-specific render options. * @@ -106,29 +103,72 @@ private static List> defaultHandlers() { new PdfTransformEndRenderHandler()); } - PdfFixedLayoutBackend(Collection> handlers) { - this(handlers, false, null, null, null, List.of()); + private static PdfLinkAnnotationWriter.PlacedPdfRect spanLinkRectangle(ParagraphSpan span, + double spanX, + double lineTop, + double lineHeight, + double textAscent, + double baselineOffsetFromBottom) { + com.demcha.compose.document.node.InlineImageAlignment alignment; + double graphicHeight; + double baselineOffset; + if (span instanceof ParagraphImageSpan imageSpan) { + alignment = imageSpan.alignment(); + graphicHeight = imageSpan.height(); + baselineOffset = imageSpan.baselineOffset(); + } else if (span instanceof com.demcha.compose.document.layout.payloads.ParagraphShapeSpan shapeSpan) { + alignment = shapeSpan.alignment(); + graphicHeight = shapeSpan.height(); + baselineOffset = shapeSpan.baselineOffset(); + } else { + // Text spans cover the full line box. + return new PdfLinkAnnotationWriter.PlacedPdfRect( + spanX, + lineTop - lineHeight, + span.width(), + lineHeight); + } + // Inline-graphic baseline placement, kept in lockstep with + // PdfParagraphFragmentRenderHandler.resolveInlineGraphicBottom — both + // place an inline image or shape on the text baseline identically. + double baselineY = lineTop - lineHeight + baselineOffsetFromBottom; + double lineBottom = baselineY - baselineOffsetFromBottom; + double base = switch (alignment == null + ? com.demcha.compose.document.node.InlineImageAlignment.CENTER + : alignment) { + case BASELINE -> baselineY; + case CENTER -> lineBottom + (lineHeight - graphicHeight) / 2.0; + case TEXT_TOP -> baselineY + textAscent - graphicHeight; + case TEXT_BOTTOM -> lineBottom; + }; + return new PdfLinkAnnotationWriter.PlacedPdfRect( + spanX, + base + baselineOffset, + span.width(), + graphicHeight); } - private PdfFixedLayoutBackend(Collection> handlers, - boolean guideLines, - PdfMetadataOptions metadataOptions, - PdfWatermarkOptions watermarkOptions, - PdfProtectionOptions protectionOptions, - Collection headerFooterOptions) { - Map, PdfFragmentRenderHandler> registry = new LinkedHashMap<>(); - for (PdfFragmentRenderHandler handler : handlers) { - PdfFragmentRenderHandler previous = registry.put(handler.payloadType(), Objects.requireNonNull(handler, "handler")); + private static List> mergeHandlers( + List> defaults, + List> additions) { + if (additions.isEmpty()) { + return defaults; + } + Map, PdfFragmentRenderHandler> byPayloadType = new LinkedHashMap<>(); + for (PdfFragmentRenderHandler handler : defaults) { + byPayloadType.put(handler.payloadType(), handler); + } + for (PdfFragmentRenderHandler handler : additions) { + PdfFragmentRenderHandler previous = byPayloadType.put(handler.payloadType(), handler); if (previous != null) { - throw new IllegalArgumentException("Duplicate PDF handler for payload type " + handler.payloadType().getName()); + RENDER_LOG.debug( + "render.pdf.handler.replaced payloadType={} previous={} replacement={}", + handler.payloadType().getName(), + previous.getClass().getName(), + handler.getClass().getName()); } } - this.handlers = Map.copyOf(registry); - this.guideLines = guideLines; - this.metadataOptions = metadataOptions; - this.watermarkOptions = watermarkOptions; - this.protectionOptions = protectionOptions; - this.headerFooterOptions = List.copyOf(headerFooterOptions); + return List.copyOf(byPayloadType.values()); } @Override @@ -140,7 +180,7 @@ public String name() { * Renders the resolved layout graph into PDF bytes and optionally writes the * result to the configured output file. * - * @param graph resolved layout graph produced by the semantic compiler + * @param graph resolved layout graph produced by the semantic compiler * @param context fixed-layout render configuration including page canvas and output target * @return rendered PDF document bytes * @throws Exception if PDF creation, rendering, or saving fails @@ -189,7 +229,7 @@ public byte[] render(LayoutGraph graph, FixedLayoutRenderContext context) throws * never closes it. The caller remains responsible for HTTP/file/S3 stream * lifecycle and backpressure.

* - * @param graph resolved layout graph produced by the semantic compiler + * @param graph resolved layout graph produced by the semantic compiler * @param context fixed-layout render configuration with a non-null output stream * @throws Exception if PDF creation, rendering, or saving fails */ @@ -247,7 +287,7 @@ private int renderToOutput(LayoutGraph graph, FixedLayoutRenderContext context, for (int index = 0; index < graph.fragments().size(); index++) { PlacedFragment fragment = graph.fragments().get(index); if (fragment.payload() instanceof TableRowFragmentPayload - && tableRowHandler instanceof PdfTableRowFragmentRenderHandler tableHandler) { + && tableRowHandler instanceof PdfTableRowFragmentRenderHandler tableHandler) { index = renderTableRowGroup(graph.fragments(), index, tableHandler, environment, guideLines, ownerBounds); continue; } @@ -278,8 +318,8 @@ private int renderTableRowGroup(List fragments, String tablePath = fragments.get(startIndex).path(); int endExclusive = startIndex; while (endExclusive < fragments.size() - && Objects.equals(fragments.get(endExclusive).path(), tablePath) - && fragments.get(endExclusive).payload() instanceof TableRowFragmentPayload) { + && Objects.equals(fragments.get(endExclusive).path(), tablePath) + && fragments.get(endExclusive).payload() instanceof TableRowFragmentPayload) { endExclusive++; } @@ -407,51 +447,6 @@ private void addParagraphLinks(PlacedFragment fragment, } } - private static PdfLinkAnnotationWriter.PlacedPdfRect spanLinkRectangle(ParagraphSpan span, - double spanX, - double lineTop, - double lineHeight, - double textAscent, - double baselineOffsetFromBottom) { - com.demcha.compose.document.node.InlineImageAlignment alignment; - double graphicHeight; - double baselineOffset; - if (span instanceof ParagraphImageSpan imageSpan) { - alignment = imageSpan.alignment(); - graphicHeight = imageSpan.height(); - baselineOffset = imageSpan.baselineOffset(); - } else if (span instanceof com.demcha.compose.document.layout.payloads.ParagraphShapeSpan shapeSpan) { - alignment = shapeSpan.alignment(); - graphicHeight = shapeSpan.height(); - baselineOffset = shapeSpan.baselineOffset(); - } else { - // Text spans cover the full line box. - return new PdfLinkAnnotationWriter.PlacedPdfRect( - spanX, - lineTop - lineHeight, - span.width(), - lineHeight); - } - // Inline-graphic baseline placement, kept in lockstep with - // PdfParagraphFragmentRenderHandler.resolveInlineGraphicBottom — both - // place an inline image or shape on the text baseline identically. - double baselineY = lineTop - lineHeight + baselineOffsetFromBottom; - double lineBottom = baselineY - baselineOffsetFromBottom; - double base = switch (alignment == null - ? com.demcha.compose.document.node.InlineImageAlignment.CENTER - : alignment) { - case BASELINE -> baselineY; - case CENTER -> lineBottom + (lineHeight - graphicHeight) / 2.0; - case TEXT_TOP -> baselineY + textAscent - graphicHeight; - case TEXT_BOTTOM -> lineBottom; - }; - return new PdfLinkAnnotationWriter.PlacedPdfRect( - spanX, - base + baselineOffset, - span.width(), - graphicHeight); - } - @SuppressWarnings("unchecked") private PdfFragmentRenderHandler handlerFor(Object payload) { if (payload == null) { @@ -486,12 +481,12 @@ private PdfFragmentRenderHandler handlerFor(Object payload) { * Fluent builder for PDF-specific render options. */ public static final class Builder { + private final List headerFooterOptions = new ArrayList<>(); + private final List> additionalHandlers = new ArrayList<>(); private boolean guideLines; private PdfMetadataOptions metadataOptions; private PdfWatermarkOptions watermarkOptions; private PdfProtectionOptions protectionOptions; - private final List headerFooterOptions = new ArrayList<>(); - private final List> additionalHandlers = new ArrayList<>(); private Builder() { } @@ -512,8 +507,8 @@ private Builder() { * @param handler non-{@code null} handler implementation * @return this builder * @throws IllegalArgumentException if {@code handler} reports the same - * payload type as another custom handler already registered - * on this builder + * payload type as another custom handler already registered + * on this builder * @since 1.6.0 */ public Builder addHandler(PdfFragmentRenderHandler handler) { @@ -522,8 +517,8 @@ public Builder addHandler(PdfFragmentRenderHandler handler) { if (existing.payloadType().equals(handler.payloadType())) { throw new IllegalArgumentException( "Duplicate custom PDF handler for payload type " - + handler.payloadType().getName() - + "; remove the previous addHandler() call before registering another"); + + handler.payloadType().getName() + + "; remove the previous addHandler() call before registering another"); } } this.additionalHandlers.add(handler); @@ -619,27 +614,4 @@ public PdfFixedLayoutBackend build() { headerFooterOptions); } } - - private static List> mergeHandlers( - List> defaults, - List> additions) { - if (additions.isEmpty()) { - return defaults; - } - Map, PdfFragmentRenderHandler> byPayloadType = new LinkedHashMap<>(); - for (PdfFragmentRenderHandler handler : defaults) { - byPayloadType.put(handler.payloadType(), handler); - } - for (PdfFragmentRenderHandler handler : additions) { - PdfFragmentRenderHandler previous = byPayloadType.put(handler.payloadType(), handler); - if (previous != null) { - RENDER_LOG.debug( - "render.pdf.handler.replaced payloadType={} previous={} replacement={}", - handler.payloadType().getName(), - previous.getClass().getName(), - handler.getClass().getName()); - } - } - return List.copyOf(byPayloadType.values()); - } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFontLibraryFactory.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFontLibraryFactory.java index 781e06125..6b4b1a914 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFontLibraryFactory.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFontLibraryFactory.java @@ -53,7 +53,7 @@ public static FontLibrary library(PDDocument document) { /** * Creates a font library containing bundled and custom font families. * - * @param document PDF document that owns loaded fonts + * @param document PDF document that owns loaded fonts * @param customFamilies document-local custom font families * @return PDF-backed font library */ diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFragmentRenderHandler.java index 41cea300d..47aa06cb4 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfFragmentRenderHandler.java @@ -37,8 +37,8 @@ public interface PdfFragmentRenderHandler { /** * Renders one resolved fragment. * - * @param fragment resolved fragment placement - * @param payload fragment payload data already validated by the layout layer + * @param fragment resolved fragment placement + * @param payload fragment payload data already validated by the layout layer * @param environment shared PDF render environment for the current document pass * @throws Exception if the PDF drawing operation fails */ diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfGuideLinesRenderer.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfGuideLinesRenderer.java index 9ada89f97..93eeccfbc 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfGuideLinesRenderer.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfGuideLinesRenderer.java @@ -5,7 +5,7 @@ import com.demcha.compose.engine.components.style.Padding; import org.apache.pdfbox.pdmodel.PDPageContentStream; -import java.awt.Color; +import java.awt.*; import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -85,23 +85,6 @@ private static Bounds lookupOwnerBounds(PlacedFragment fragment, return bounds == null ? Bounds.from(fragment) : bounds; } - /** - * Lightweight axis-aligned bounding box used to compute owner unions. - */ - record Bounds(double x, double y, double width, double height) { - static Bounds from(PlacedFragment fragment) { - return new Bounds(fragment.x(), fragment.y(), fragment.width(), fragment.height()); - } - - Bounds union(Bounds other) { - double minX = Math.min(this.x, other.x); - double minY = Math.min(this.y, other.y); - double maxX = Math.max(this.x + this.width, other.x + other.width); - double maxY = Math.max(this.y + this.height, other.y + other.height); - return new Bounds(minX, minY, maxX - minX, maxY - minY); - } - } - private static void drawBox(PDPageContentStream stream, PlacedFragment fragment) throws IOException { stream.setLineDashPattern(new float[0], 0); stream.setStrokingColor(BOX_COLOR); @@ -114,8 +97,8 @@ private static void drawMargin(PDPageContentStream stream, Bounds bounds, com.demcha.compose.engine.components.style.Margin margin) throws IOException { if (bounds == null - || margin == null - || (margin.horizontal() <= 0.0 && margin.vertical() <= 0.0)) { + || margin == null + || (margin.horizontal() <= 0.0 && margin.vertical() <= 0.0)) { return; } @@ -139,8 +122,8 @@ private static void drawPadding(PDPageContentStream stream, Bounds bounds, Padding padding) throws IOException { if (bounds == null - || padding == null - || (padding.horizontal() <= 0.0 && padding.vertical() <= 0.0)) { + || padding == null + || (padding.horizontal() <= 0.0 && padding.vertical() <= 0.0)) { return; } @@ -206,4 +189,21 @@ private static void fillCircle(PDPageContentStream stream, (float) (centerX + radius), (float) centerY); stream.fill(); } + + /** + * Lightweight axis-aligned bounding box used to compute owner unions. + */ + record Bounds(double x, double y, double width, double height) { + static Bounds from(PlacedFragment fragment) { + return new Bounds(fragment.x(), fragment.y(), fragment.width(), fragment.height()); + } + + Bounds union(Bounds other) { + double minX = Math.min(this.x, other.x); + double minY = Math.min(this.y, other.y); + double maxX = Math.max(this.x + this.width, other.x + other.width); + double maxY = Math.max(this.y + this.height, other.y + other.height); + return new Bounds(minX, minY, maxX - minX, maxY - minY); + } + } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOptionsAdapter.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOptionsAdapter.java index aae9adae0..53cd6452b 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOptionsAdapter.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOptionsAdapter.java @@ -1,14 +1,8 @@ package com.demcha.compose.document.backend.fixed.pdf; +import com.demcha.compose.document.backend.fixed.pdf.options.*; import com.demcha.compose.document.node.DocumentBarcodeOptions; import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterZone; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfMetadataOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfProtectionOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkLayer; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkPosition; import com.demcha.compose.engine.components.content.barcode.BarcodeData; import com.demcha.compose.engine.components.content.barcode.BarcodeType; import com.demcha.compose.engine.components.content.header_footer.HeaderFooterConfig; diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOutputOptionsTranslator.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOutputOptionsTranslator.java index 21813ba47..365acc73a 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOutputOptionsTranslator.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfOutputOptionsTranslator.java @@ -1,19 +1,7 @@ package com.demcha.compose.document.backend.fixed.pdf; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfHeaderFooterZone; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfMetadataOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfProtectionOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkLayer; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkOptions; -import com.demcha.compose.document.backend.fixed.pdf.options.PdfWatermarkPosition; -import com.demcha.compose.document.output.DocumentHeaderFooter; -import com.demcha.compose.document.output.DocumentHeaderFooterZone; -import com.demcha.compose.document.output.DocumentMetadata; -import com.demcha.compose.document.output.DocumentProtection; -import com.demcha.compose.document.output.DocumentWatermark; -import com.demcha.compose.document.output.DocumentWatermarkLayer; -import com.demcha.compose.document.output.DocumentWatermarkPosition; +import com.demcha.compose.document.backend.fixed.pdf.options.*; +import com.demcha.compose.document.output.*; /** * Translates backend-neutral document output options into PDF-specific diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfRenderEnvironment.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfRenderEnvironment.java index d5aa5c04a..25bb55ea1 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfRenderEnvironment.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/PdfRenderEnvironment.java @@ -1,9 +1,9 @@ package com.demcha.compose.document.backend.fixed.pdf; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.font.FontLibrary; import com.demcha.compose.document.layout.PlacedFragment; +import com.demcha.compose.document.node.DocumentBookmarkOptions; import com.demcha.compose.engine.components.content.ImageData; +import com.demcha.compose.font.FontLibrary; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfAlphaSupport.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfAlphaSupport.java index ff275486c..fc1b18733 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfAlphaSupport.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfAlphaSupport.java @@ -3,7 +3,7 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState; -import java.awt.Color; +import java.awt.*; import java.io.IOException; /** @@ -28,7 +28,7 @@ private PdfAlphaSupport() { * Sets the non-stroking (fill) alpha constant when the colour is translucent. * * @param stream page content stream inside a saved graphics state - * @param color fill colour, possibly carrying alpha + * @param color fill colour, possibly carrying alpha * @throws IOException when the graphics-state write fails */ static void applyFillAlpha(PDPageContentStream stream, Color color) throws IOException { @@ -44,7 +44,7 @@ static void applyFillAlpha(PDPageContentStream stream, Color color) throws IOExc * Sets the stroking alpha constant when the colour is translucent. * * @param stream page content stream inside a saved graphics state - * @param color stroke colour, possibly carrying alpha + * @param color stroke colour, possibly carrying alpha * @throws IOException when the graphics-state write fails */ static void applyStrokeAlpha(PDPageContentStream stream, Color color) throws IOException { diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfBarcodeFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfBarcodeFragmentRenderHandler.java index c38e4b4cb..5da9ea442 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfBarcodeFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfBarcodeFragmentRenderHandler.java @@ -11,11 +11,7 @@ import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; import com.google.zxing.datamatrix.DataMatrixWriter; -import com.google.zxing.oned.Code128Writer; -import com.google.zxing.oned.Code39Writer; -import com.google.zxing.oned.EAN13Writer; -import com.google.zxing.oned.EAN8Writer; -import com.google.zxing.oned.UPCAWriter; +import com.google.zxing.oned.*; import com.google.zxing.pdf417.PDF417Writer; import com.google.zxing.qrcode.QRCodeWriter; import org.apache.pdfbox.pdmodel.PDPageContentStream; diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfEllipseFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfEllipseFragmentRenderHandler.java index 32aeafd77..dde69482f 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfEllipseFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfEllipseFragmentRenderHandler.java @@ -23,32 +23,11 @@ public final class PdfEllipseFragmentRenderHandler public PdfEllipseFragmentRenderHandler() { } - @Override - public Class payloadType() { - return EllipseFragmentPayload.class; - } - - @Override - public void render(PlacedFragment fragment, - EllipseFragmentPayload payload, - PdfRenderEnvironment environment) throws IOException { - if (fragment.width() <= 0 || fragment.height() <= 0) { - return; - } - PDPageContentStream stream = environment.pageSurface(fragment.pageIndex()); - float x = (float) fragment.x(); - float y = (float) fragment.y(); - float width = (float) fragment.width(); - float height = (float) fragment.height(); - PdfShapeGeometry.fillAndStrokePath(stream, payload.fillColor(), payload.stroke(), - s -> drawEllipse(s, x, y, width, height)); - } - static void drawEllipse(PDPageContentStream stream, - float x, - float y, - float width, - float height) throws IOException { + float x, + float y, + float width, + float height) throws IOException { float centerX = x + width / 2.0f; float centerY = y + height / 2.0f; float radiusX = width / 2.0f; @@ -71,4 +50,25 @@ static void drawEllipse(PDPageContentStream stream, centerX + radiusX, centerY); stream.closePath(); } + + @Override + public Class payloadType() { + return EllipseFragmentPayload.class; + } + + @Override + public void render(PlacedFragment fragment, + EllipseFragmentPayload payload, + PdfRenderEnvironment environment) throws IOException { + if (fragment.width() <= 0 || fragment.height() <= 0) { + return; + } + PDPageContentStream stream = environment.pageSurface(fragment.pageIndex()); + float x = (float) fragment.x(); + float y = (float) fragment.y(); + float width = (float) fragment.width(); + float height = (float) fragment.height(); + PdfShapeGeometry.fillAndStrokePath(stream, payload.fillColor(), payload.stroke(), + s -> drawEllipse(s, x, y, width, height)); + } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfImageFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfImageFragmentRenderHandler.java index 5a2408b00..abdd4d842 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfImageFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfImageFragmentRenderHandler.java @@ -24,33 +24,6 @@ public final class PdfImageFragmentRenderHandler public PdfImageFragmentRenderHandler() { } - @Override - public Class payloadType() { - return ImageFragmentPayload.class; - } - - @Override - public void render(PlacedFragment fragment, - ImageFragmentPayload payload, - PdfRenderEnvironment environment) throws IOException { - if (fragment.width() <= 0 || fragment.height() <= 0) { - return; - } - - PDImageXObject image = environment.resolveImage(payload.imageData()); - PDPageContentStream stream = environment.pageSurface(fragment.pageIndex()); - DrawBounds bounds = resolveDrawBounds(fragment, payload.fitMode(), image.getWidth(), image.getHeight()); - if (payload.fitMode() == DocumentImageFitMode.COVER) { - stream.saveGraphicsState(); - stream.addRect((float) fragment.x(), (float) fragment.y(), (float) fragment.width(), (float) fragment.height()); - stream.clip(); - stream.drawImage(image, bounds.x(), bounds.y(), bounds.width(), bounds.height()); - stream.restoreGraphicsState(); - } else { - stream.drawImage(image, bounds.x(), bounds.y(), bounds.width(), bounds.height()); - } - } - private static DrawBounds resolveDrawBounds(PlacedFragment fragment, DocumentImageFitMode fitMode, int imageWidth, @@ -78,6 +51,33 @@ private static DrawBounds resolveDrawBounds(PlacedFragment fragment, return new DrawBounds((float) drawX, (float) drawY, (float) drawWidth, (float) drawHeight); } + @Override + public Class payloadType() { + return ImageFragmentPayload.class; + } + + @Override + public void render(PlacedFragment fragment, + ImageFragmentPayload payload, + PdfRenderEnvironment environment) throws IOException { + if (fragment.width() <= 0 || fragment.height() <= 0) { + return; + } + + PDImageXObject image = environment.resolveImage(payload.imageData()); + PDPageContentStream stream = environment.pageSurface(fragment.pageIndex()); + DrawBounds bounds = resolveDrawBounds(fragment, payload.fitMode(), image.getWidth(), image.getHeight()); + if (payload.fitMode() == DocumentImageFitMode.COVER) { + stream.saveGraphicsState(); + stream.addRect((float) fragment.x(), (float) fragment.y(), (float) fragment.width(), (float) fragment.height()); + stream.clip(); + stream.drawImage(image, bounds.x(), bounds.y(), bounds.width(), bounds.height()); + stream.restoreGraphicsState(); + } else { + stream.drawImage(image, bounds.x(), bounds.y(), bounds.width(), bounds.height()); + } + } + private record DrawBounds(float x, float y, float width, float height) { } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfLineFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfLineFragmentRenderHandler.java index 3f3806bfb..a76e6c2a4 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfLineFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfLineFragmentRenderHandler.java @@ -25,6 +25,18 @@ public final class PdfLineFragmentRenderHandler public PdfLineFragmentRenderHandler() { } + private static void applyDashPattern(PDPageContentStream stream, DocumentDashPattern dash) throws IOException { + if (dash == null || dash.isSolid()) { + return; + } + List segments = dash.segments(); + float[] dashArray = new float[segments.size()]; + for (int i = 0; i < dashArray.length; i++) { + dashArray[i] = segments.get(i).floatValue(); + } + stream.setLineDashPattern(dashArray, 0f); + } + @Override public Class payloadType() { return LineFragmentPayload.class; @@ -52,16 +64,4 @@ public void render(PlacedFragment fragment, stream.restoreGraphicsState(); } } - - private static void applyDashPattern(PDPageContentStream stream, DocumentDashPattern dash) throws IOException { - if (dash == null || dash.isSolid()) { - return; - } - List segments = dash.segments(); - float[] dashArray = new float[segments.size()]; - for (int i = 0; i < dashArray.length; i++) { - dashArray[i] = segments.get(i).floatValue(); - } - stream.setLineDashPattern(dashArray, 0f); - } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfParagraphFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfParagraphFragmentRenderHandler.java index ff55e8a1f..640a72510 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfParagraphFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfParagraphFragmentRenderHandler.java @@ -3,24 +3,18 @@ import com.demcha.compose.document.backend.fixed.pdf.PdfFragmentRenderHandler; import com.demcha.compose.document.backend.fixed.pdf.PdfRenderEnvironment; import com.demcha.compose.document.layout.PlacedFragment; -import com.demcha.compose.document.layout.payloads.ParagraphFragmentPayload; -import com.demcha.compose.document.layout.payloads.ParagraphShapeSpan; -import com.demcha.compose.document.layout.payloads.ResolvedShapeLayer; -import com.demcha.compose.document.layout.payloads.ParagraphImageSpan; -import com.demcha.compose.document.layout.payloads.ParagraphLine; -import com.demcha.compose.document.layout.payloads.ParagraphSpan; -import com.demcha.compose.document.layout.payloads.ParagraphTextSpan; +import com.demcha.compose.document.layout.payloads.*; import com.demcha.compose.document.node.InlineImageAlignment; import com.demcha.compose.document.node.TextVerticalAlign; import com.demcha.compose.document.style.DocumentCornerRadius; import com.demcha.compose.document.style.ShapeOutline; -import com.demcha.compose.font.FontLibrary; import com.demcha.compose.engine.render.pdf.PdfFont; +import com.demcha.compose.font.FontLibrary; import org.apache.pdfbox.pdmodel.PDPageContentStream; import org.apache.pdfbox.pdmodel.font.PDFont; import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; -import java.awt.Color; +import java.awt.*; import java.io.IOException; import java.util.List; @@ -41,52 +35,6 @@ public final class PdfParagraphFragmentRenderHandler public PdfParagraphFragmentRenderHandler() { } - @Override - public Class payloadType() { - return ParagraphFragmentPayload.class; - } - - @Override - public void render(PlacedFragment fragment, - ParagraphFragmentPayload payload, - PdfRenderEnvironment environment) throws IOException { - FontLibrary fonts = environment.fonts(); - double innerX = fragment.x() + payload.padding().left(); - double innerWidth = Math.max(0.0, fragment.width() - payload.padding().horizontal()); - double contentTop = fragment.y() + fragment.height() - payload.padding().top(); - PDPageContentStream stream = environment.pageSurface(fragment.pageIndex()); - - stream.saveGraphicsState(); - try { - // Font and non-stroking colour persist across BT/ET within this one - // q...Q block, so track the last-written pair and re-emit Tf/rg only - // when a span actually changes them — a single-style paragraph then - // emits one setFont + one setNonStrokingColor instead of one per span. - TextRenderState textState = new TextRenderState(); - double cursorTop = contentTop; - for (int lineIndex = 0; lineIndex < payload.lines().size(); lineIndex++) { - ParagraphLine line = payload.lines().get(lineIndex); - double lineTop = cursorTop; - double resolvedLineHeight = line.lineHeight(); - double baselineY = lineTop - resolvedLineHeight + line.baselineOffsetFromBottom(); - if (payload.verticalAlign() != TextVerticalAlign.DEFAULT) { - baselineY += verticalSeatShift(line, fonts, payload.verticalAlign()); - } - double lineX = switch (payload.align()) { - case RIGHT -> innerX + innerWidth - line.width(); - case CENTER -> innerX + (innerWidth - line.width()) / 2.0; - case LEFT -> innerX; - }; - - renderLine(stream, fonts, line, lineX, baselineY, environment, textState); - - cursorTop = lineTop - resolvedLineHeight - payload.lineGap(); - } - } finally { - stream.restoreGraphicsState(); - } - } - /** * Baseline correction that seats a line by its cap band within the line box, * used for the non-default {@link TextVerticalAlign} modes. Derived purely @@ -129,86 +77,6 @@ private static double verticalSeatShift(ParagraphLine line, FontLibrary fonts, T return 0.0; } - private void renderLine(PDPageContentStream stream, - FontLibrary fonts, - ParagraphLine line, - double lineX, - double baselineY, - PdfRenderEnvironment environment, - TextRenderState textState) throws IOException { - List spans = line.spans(); - if (spans.isEmpty()) { - return; - } - - boolean inTextBlock = false; - double cursorX = lineX; - try { - for (ParagraphSpan span : spans) { - if (span instanceof ParagraphTextSpan textSpan) { - PdfFont font = fonts.getFont(textSpan.textStyle().fontName(), PdfFont.class).orElseThrow(); - // Font-aware sanitization keeps width measurement - // (PdfFont.getTextWidth) and the bytes emitted here - // in lockstep. PdfFont.sanitizeForRender substitutes - // any code point the resolved font cannot encode - // with '?', preventing PDFBox from throwing on - // arrows / bullets / emoji / unsupported unicode. - String text = font.sanitizeForRender(textSpan.textStyle(), textSpan.text()); - if (text.isEmpty()) { - cursorX += textSpan.width(); - continue; - } - if (!inTextBlock) { - stream.beginText(); - stream.newLineAtOffset((float) cursorX, (float) baselineY); - inTextBlock = true; - } - textState.applyFont(stream, - font.fontType(textSpan.textStyle().decoration()), - (float) textSpan.textStyle().size()); - textState.applyColor(stream, textSpan.textStyle().color()); - stream.showText(text); - cursorX += textSpan.width(); - } else if (span instanceof ParagraphImageSpan imageSpan) { - if (inTextBlock) { - stream.endText(); - inTextBlock = false; - } - double imageBottom = resolveImageBottom( - imageSpan, - baselineY, - line.textAscent(), - line.baselineOffsetFromBottom(), - line.lineHeight()); - PDImageXObject image = environment.resolveImage(imageSpan.imageData()); - stream.drawImage(image, - (float) cursorX, - (float) imageBottom, - (float) imageSpan.width(), - (float) imageSpan.height()); - // An inline graphic runs its own graphics-state save/restore and - // colour ops; drop the tracked font/colour so the next text span - // re-emits them rather than trusting persistence across it. - textState.invalidate(); - cursorX += imageSpan.width(); - } else if (span instanceof ParagraphShapeSpan shapeSpan) { - if (inTextBlock) { - stream.endText(); - inTextBlock = false; - } - renderShape(stream, shapeSpan, cursorX, baselineY, - line.textAscent(), line.baselineOffsetFromBottom(), line.lineHeight()); - textState.invalidate(); - cursorX += shapeSpan.width(); - } - } - } finally { - if (inTextBlock) { - stream.endText(); - } - } - } - private static double resolveImageBottom(ParagraphImageSpan imageSpan, double baselineY, double textAscent, @@ -302,6 +170,132 @@ private static void renderShape(PDPageContentStream stream, } } + @Override + public Class payloadType() { + return ParagraphFragmentPayload.class; + } + + @Override + public void render(PlacedFragment fragment, + ParagraphFragmentPayload payload, + PdfRenderEnvironment environment) throws IOException { + FontLibrary fonts = environment.fonts(); + double innerX = fragment.x() + payload.padding().left(); + double innerWidth = Math.max(0.0, fragment.width() - payload.padding().horizontal()); + double contentTop = fragment.y() + fragment.height() - payload.padding().top(); + PDPageContentStream stream = environment.pageSurface(fragment.pageIndex()); + + stream.saveGraphicsState(); + try { + // Font and non-stroking colour persist across BT/ET within this one + // q...Q block, so track the last-written pair and re-emit Tf/rg only + // when a span actually changes them — a single-style paragraph then + // emits one setFont + one setNonStrokingColor instead of one per span. + TextRenderState textState = new TextRenderState(); + double cursorTop = contentTop; + for (int lineIndex = 0; lineIndex < payload.lines().size(); lineIndex++) { + ParagraphLine line = payload.lines().get(lineIndex); + double lineTop = cursorTop; + double resolvedLineHeight = line.lineHeight(); + double baselineY = lineTop - resolvedLineHeight + line.baselineOffsetFromBottom(); + if (payload.verticalAlign() != TextVerticalAlign.DEFAULT) { + baselineY += verticalSeatShift(line, fonts, payload.verticalAlign()); + } + double lineX = switch (payload.align()) { + case RIGHT -> innerX + innerWidth - line.width(); + case CENTER -> innerX + (innerWidth - line.width()) / 2.0; + case LEFT -> innerX; + }; + + renderLine(stream, fonts, line, lineX, baselineY, environment, textState); + + cursorTop = lineTop - resolvedLineHeight - payload.lineGap(); + } + } finally { + stream.restoreGraphicsState(); + } + } + + private void renderLine(PDPageContentStream stream, + FontLibrary fonts, + ParagraphLine line, + double lineX, + double baselineY, + PdfRenderEnvironment environment, + TextRenderState textState) throws IOException { + List spans = line.spans(); + if (spans.isEmpty()) { + return; + } + + boolean inTextBlock = false; + double cursorX = lineX; + try { + for (ParagraphSpan span : spans) { + if (span instanceof ParagraphTextSpan textSpan) { + PdfFont font = fonts.getFont(textSpan.textStyle().fontName(), PdfFont.class).orElseThrow(); + // Font-aware sanitization keeps width measurement + // (PdfFont.getTextWidth) and the bytes emitted here + // in lockstep. PdfFont.sanitizeForRender substitutes + // any code point the resolved font cannot encode + // with '?', preventing PDFBox from throwing on + // arrows / bullets / emoji / unsupported unicode. + String text = font.sanitizeForRender(textSpan.textStyle(), textSpan.text()); + if (text.isEmpty()) { + cursorX += textSpan.width(); + continue; + } + if (!inTextBlock) { + stream.beginText(); + stream.newLineAtOffset((float) cursorX, (float) baselineY); + inTextBlock = true; + } + textState.applyFont(stream, + font.fontType(textSpan.textStyle().decoration()), + (float) textSpan.textStyle().size()); + textState.applyColor(stream, textSpan.textStyle().color()); + stream.showText(text); + cursorX += textSpan.width(); + } else if (span instanceof ParagraphImageSpan imageSpan) { + if (inTextBlock) { + stream.endText(); + inTextBlock = false; + } + double imageBottom = resolveImageBottom( + imageSpan, + baselineY, + line.textAscent(), + line.baselineOffsetFromBottom(), + line.lineHeight()); + PDImageXObject image = environment.resolveImage(imageSpan.imageData()); + stream.drawImage(image, + (float) cursorX, + (float) imageBottom, + (float) imageSpan.width(), + (float) imageSpan.height()); + // An inline graphic runs its own graphics-state save/restore and + // colour ops; drop the tracked font/colour so the next text span + // re-emits them rather than trusting persistence across it. + textState.invalidate(); + cursorX += imageSpan.width(); + } else if (span instanceof ParagraphShapeSpan shapeSpan) { + if (inTextBlock) { + stream.endText(); + inTextBlock = false; + } + renderShape(stream, shapeSpan, cursorX, baselineY, + line.textAscent(), line.baselineOffsetFromBottom(), line.lineHeight()); + textState.invalidate(); + cursorX += shapeSpan.width(); + } + } + } finally { + if (inTextBlock) { + stream.endText(); + } + } + } + /** * Tracks the font/size and non-stroking colour last written to the content * stream within one paragraph's {@code q...Q} block, so the handler emits a diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java index f945cab98..3b32b7f71 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShadingSupport.java @@ -1,12 +1,7 @@ package com.demcha.compose.document.backend.fixed.pdf.handlers; import com.demcha.compose.document.style.DocumentPaint; -import org.apache.pdfbox.cos.COSArray; -import org.apache.pdfbox.cos.COSBoolean; -import org.apache.pdfbox.cos.COSDictionary; -import org.apache.pdfbox.cos.COSFloat; -import org.apache.pdfbox.cos.COSInteger; -import org.apache.pdfbox.cos.COSName; +import org.apache.pdfbox.cos.*; import org.apache.pdfbox.pdmodel.common.function.PDFunction; import org.apache.pdfbox.pdmodel.common.function.PDFunctionType2; import org.apache.pdfbox.pdmodel.common.function.PDFunctionType3; @@ -15,7 +10,7 @@ import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType2; import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType3; -import java.awt.Color; +import java.awt.*; import java.util.List; /** @@ -41,14 +36,14 @@ private PdfShadingSupport() { /** * Builds the shading for a gradient paint over the given box. * - * @param paint gradient paint ({@link DocumentPaint.Linear} or {@link DocumentPaint.Radial}) - * @param x box left, page coordinates - * @param y box bottom, page coordinates - * @param width box width + * @param paint gradient paint ({@link DocumentPaint.Linear} or {@link DocumentPaint.Radial}) + * @param x box left, page coordinates + * @param y box bottom, page coordinates + * @param width box width * @param height box height * @return configured shading * @throws IllegalArgumentException for a {@link DocumentPaint.Solid} (solid - * fills never reach the shading path) + * fills never reach the shading path) */ static PDShading build(DocumentPaint paint, float x, float y, float width, float height) { if (paint instanceof DocumentPaint.Linear linear) { @@ -92,7 +87,7 @@ private static PDShading radial(DocumentPaint.Radial radial, double cy = y + radial.cy() * height; // Radius to the farthest corner so the last stop always reaches it. double r = 0.0; - for (double[] corner : new double[][] {{x, y}, {x + width, y}, {x, y + height}, + for (double[] corner : new double[][]{{x, y}, {x + width, y}, {x, y + height}, {x + width, y + height}}) { r = Math.max(r, Math.hypot(corner[0] - cx, corner[1] - cy)); } @@ -120,7 +115,9 @@ private static COSArray bothExtend() { return extend; } - /** Two stops → one exponential function; more → a stitching function. */ + /** + * Two stops → one exponential function; more → a stitching function. + */ private static PDFunction stopsFunction(List stops) { if (stops.size() == 2) { return segment(stops.get(0).color().color(), stops.get(1).color().color()); diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeClipBeginRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeClipBeginRenderHandler.java index bd1265aeb..fd64f5551 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeClipBeginRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeClipBeginRenderHandler.java @@ -42,6 +42,34 @@ public final class PdfShapeClipBeginRenderHandler public PdfShapeClipBeginRenderHandler() { } + private static void addEllipsePath(PDPageContentStream stream, + float x, + float y, + float width, + float height) throws IOException { + float centerX = x + width / 2.0f; + float centerY = y + height / 2.0f; + float radiusX = width / 2.0f; + float radiusY = height / 2.0f; + float controlX = radiusX * BEZIER_CIRCLE_CONSTANT; + float controlY = radiusY * BEZIER_CIRCLE_CONSTANT; + + stream.moveTo(centerX + radiusX, centerY); + stream.curveTo(centerX + radiusX, centerY + controlY, + centerX + controlX, centerY + radiusY, + centerX, centerY + radiusY); + stream.curveTo(centerX - controlX, centerY + radiusY, + centerX - radiusX, centerY + controlY, + centerX - radiusX, centerY); + stream.curveTo(centerX - radiusX, centerY - controlY, + centerX - controlX, centerY - radiusY, + centerX, centerY - radiusY); + stream.curveTo(centerX + controlX, centerY - radiusY, + centerX + radiusX, centerY - controlY, + centerX + radiusX, centerY); + stream.closePath(); + } + @Override public Class payloadType() { return ShapeClipBeginPayload.class; @@ -101,32 +129,4 @@ public void render(PlacedFragment fragment, // ops on subsequent fragments, so we use the no-op path-painter). stream.clip(); } - - private static void addEllipsePath(PDPageContentStream stream, - float x, - float y, - float width, - float height) throws IOException { - float centerX = x + width / 2.0f; - float centerY = y + height / 2.0f; - float radiusX = width / 2.0f; - float radiusY = height / 2.0f; - float controlX = radiusX * BEZIER_CIRCLE_CONSTANT; - float controlY = radiusY * BEZIER_CIRCLE_CONSTANT; - - stream.moveTo(centerX + radiusX, centerY); - stream.curveTo(centerX + radiusX, centerY + controlY, - centerX + controlX, centerY + radiusY, - centerX, centerY + radiusY); - stream.curveTo(centerX - controlX, centerY + radiusY, - centerX - radiusX, centerY + controlY, - centerX - radiusX, centerY); - stream.curveTo(centerX - radiusX, centerY - controlY, - centerX - controlX, centerY - radiusY, - centerX, centerY - radiusY); - stream.curveTo(centerX + controlX, centerY - radiusY, - centerX + radiusX, centerY - controlY, - centerX + radiusX, centerY); - stream.closePath(); - } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeFragmentRenderHandler.java index 11215a0f8..7911dc1b8 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeFragmentRenderHandler.java @@ -4,7 +4,6 @@ import com.demcha.compose.document.backend.fixed.pdf.PdfRenderEnvironment; import com.demcha.compose.document.layout.PlacedFragment; import com.demcha.compose.document.layout.payloads.ShapeFragmentPayload; -import com.demcha.compose.document.layout.payloads.SideBorders; import com.demcha.compose.document.style.DocumentCornerRadius; import com.demcha.compose.engine.components.content.shape.Stroke; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -25,6 +24,51 @@ public final class PdfShapeFragmentRenderHandler public PdfShapeFragmentRenderHandler() { } + private static void drawSideBorder(PDPageContentStream stream, + Stroke side, + float x1, float y1, float x2, float y2) throws IOException { + if (side == null || side.strokeColor() == null || side.width() <= 0) { + return; + } + stream.saveGraphicsState(); + try { + stream.setStrokingColor(side.strokeColor().color()); + stream.setLineWidth((float) side.width()); + stream.moveTo(x1, y1); + stream.lineTo(x2, y2); + stream.stroke(); + } finally { + stream.restoreGraphicsState(); + } + } + + private static float clampCornerRadius(double raw, float maxAllowed) { + if (raw <= 0.0 || Double.isNaN(raw)) { + return 0f; + } + float capped = (float) raw; + return capped > maxAllowed ? maxAllowed : capped; + } + + /** + * Draws a rectangle outline whose four corners may have independent + * radii. Each radius gets its own Bezier arc; a zero radius keeps a + * sharp 90° corner (no arc, just a line into the corner). PDF y + * grows up, so {@code (x, y)} is the bottom-left of the rectangle. + */ + static void drawRoundedRectangle(PDPageContentStream stream, + float x, + float y, + float width, + float height, + float topLeft, + float topRight, + float bottomRight, + float bottomLeft) throws IOException { + PdfShapeGeometry.roundedRectPath(stream, x, y, width, height, + topLeft, topRight, bottomRight, bottomLeft); + } + @Override public Class payloadType() { return ShapeFragmentPayload.class; @@ -41,8 +85,8 @@ public void render(PlacedFragment fragment, boolean hasFill = payload.fillColor() != null; boolean hasGradient = payload.fillPaint() != null; boolean hasStroke = payload.stroke() != null - && payload.stroke().strokeColor() != null - && payload.stroke().width() > 0; + && payload.stroke().strokeColor() != null + && payload.stroke().width() > 0; boolean hasSideBorders = payload.sideBorders() != null && payload.sideBorders().hasAny(); if (!hasFill && !hasGradient && !hasStroke && !hasSideBorders) { return; @@ -98,10 +142,10 @@ public void render(PlacedFragment fragment, if (hasSideBorders) { // Per-side borders override the uniform rectangle stroke; rounded // corners are not combined with mixed-side borders in v1.3. - drawSideBorder(stream, payload.sideBorders().top(), x, y + height, x + width, y + height); - drawSideBorder(stream, payload.sideBorders().right(), x + width, y + height, x + width, y); - drawSideBorder(stream, payload.sideBorders().bottom(), x, y, x + width, y); - drawSideBorder(stream, payload.sideBorders().left(), x, y + height, x, y); + drawSideBorder(stream, payload.sideBorders().top(), x, y + height, x + width, y + height); + drawSideBorder(stream, payload.sideBorders().right(), x + width, y + height, x + width, y); + drawSideBorder(stream, payload.sideBorders().bottom(), x, y, x + width, y); + drawSideBorder(stream, payload.sideBorders().left(), x, y + height, x, y); } else if (hasStroke) { PdfAlphaSupport.applyStrokeAlpha(stream, payload.stroke().strokeColor().color()); stream.setStrokingColor(payload.stroke().strokeColor().color()); @@ -118,49 +162,4 @@ public void render(PlacedFragment fragment, stream.restoreGraphicsState(); } } - - private static void drawSideBorder(PDPageContentStream stream, - Stroke side, - float x1, float y1, float x2, float y2) throws IOException { - if (side == null || side.strokeColor() == null || side.width() <= 0) { - return; - } - stream.saveGraphicsState(); - try { - stream.setStrokingColor(side.strokeColor().color()); - stream.setLineWidth((float) side.width()); - stream.moveTo(x1, y1); - stream.lineTo(x2, y2); - stream.stroke(); - } finally { - stream.restoreGraphicsState(); - } - } - - private static float clampCornerRadius(double raw, float maxAllowed) { - if (raw <= 0.0 || Double.isNaN(raw)) { - return 0f; - } - float capped = (float) raw; - return capped > maxAllowed ? maxAllowed : capped; - } - - /** - * Draws a rectangle outline whose four corners may have independent - * radii. Each radius gets its own Bezier arc; a zero radius keeps a - * sharp 90° corner (no arc, just a line into the corner). PDF y - * grows up, so {@code (x, y)} is the bottom-left of the rectangle. - */ - static void drawRoundedRectangle(PDPageContentStream stream, - float x, - float y, - float width, - float height, - float topLeft, - float topRight, - float bottomRight, - float bottomLeft) throws IOException { - PdfShapeGeometry.roundedRectPath(stream, x, y, width, height, - topLeft, topRight, bottomRight, bottomLeft); - } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeGeometry.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeGeometry.java index 019586369..a514734be 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeGeometry.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfShapeGeometry.java @@ -4,7 +4,7 @@ import com.demcha.compose.engine.components.content.shape.Stroke; import org.apache.pdfbox.pdmodel.PDPageContentStream; -import java.awt.Color; +import java.awt.*; import java.io.IOException; import java.util.List; @@ -18,15 +18,6 @@ final class PdfShapeGeometry { private PdfShapeGeometry() { } - /** - * A path contribution: the caller adds the geometry (ellipse, rectangle, - * polygon, …) so the fill/stroke wrapper can be shared. - */ - @FunctionalInterface - interface PathEmitter { - void emit(PDPageContentStream stream) throws IOException; - } - /** * Paints a path with optional fill and/or stroke, sharing the * save/restore + colour setup + fill/stroke selection across every shape @@ -38,9 +29,9 @@ static void fillAndStrokePath(PDPageContentStream stream, PathEmitter path) throws IOException { boolean hasFill = fillColor != null; boolean hasStroke = stroke != null - && stroke.strokeColor() != null - && stroke.strokeColor().color() != null - && stroke.width() > 0; + && stroke.strokeColor() != null + && stroke.strokeColor().color() != null + && stroke.width() > 0; if (!hasFill && !hasStroke) { return; } @@ -146,4 +137,13 @@ static void roundedRectPath(PDPageContentStream stream, } stream.closePath(); } + + /** + * A path contribution: the caller adds the geometry (ellipse, rectangle, + * polygon, …) so the fill/stroke wrapper can be shared. + */ + @FunctionalInterface + interface PathEmitter { + void emit(PDPageContentStream stream) throws IOException; + } } diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfTableRowFragmentRenderHandler.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfTableRowFragmentRenderHandler.java index 2f2a08247..76dcb522d 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfTableRowFragmentRenderHandler.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/handlers/PdfTableRowFragmentRenderHandler.java @@ -4,13 +4,13 @@ import com.demcha.compose.document.backend.fixed.pdf.PdfRenderEnvironment; import com.demcha.compose.document.layout.PlacedFragment; import com.demcha.compose.document.layout.payloads.TableRowFragmentPayload; -import com.demcha.compose.font.FontLibrary; import com.demcha.compose.engine.components.content.shape.Side; import com.demcha.compose.engine.components.content.table.TableResolvedCell; import com.demcha.compose.engine.components.layout.Anchor; import com.demcha.compose.engine.components.style.Padding; import com.demcha.compose.engine.render.pdf.PdfFont; import com.demcha.compose.engine.text.TextControlSanitizer; +import com.demcha.compose.font.FontLibrary; import org.apache.pdfbox.pdmodel.PDPageContentStream; import java.io.IOException; @@ -54,8 +54,8 @@ public void render(PlacedFragment fragment, * eventual stroke avoids sub-pixel page-background seams around row-span * joins.

* - * @param fragment placed row fragment to render - * @param payload table-row payload carrying the resolved cells + * @param fragment placed row fragment to render + * @param payload table-row payload carrying the resolved cells * @param environment active PDF render environment * @throws java.io.IOException if writing to the PDF content stream fails */ @@ -74,8 +74,8 @@ public void renderFills(PlacedFragment fragment, /** * Paints table cell borders and text for one row fragment. * - * @param fragment placed row fragment to render - * @param payload table-row payload carrying the resolved cells + * @param fragment placed row fragment to render + * @param payload table-row payload carrying the resolved cells * @param environment active PDF render environment * @throws java.io.IOException if writing to the PDF content stream fails */ diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfBarcodeOptions.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfBarcodeOptions.java index 6254b3ffe..8e71f134e 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfBarcodeOptions.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfBarcodeOptions.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Getter; -import java.awt.Color; +import java.awt.*; /** * Canonical barcode payload configuration attached to semantic barcode nodes. diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfHeaderFooterOptions.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfHeaderFooterOptions.java index a031e6f9f..7a1625d23 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfHeaderFooterOptions.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfHeaderFooterOptions.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Getter; -import java.awt.Color; +import java.awt.*; /** * Canonical repeating header/footer configuration for the semantic PDF API. diff --git a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfWatermarkOptions.java b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfWatermarkOptions.java index 24354055a..95ff1a550 100644 --- a/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfWatermarkOptions.java +++ b/src/main/java/com/demcha/compose/document/backend/fixed/pdf/options/PdfWatermarkOptions.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Getter; -import java.awt.Color; +import java.awt.*; import java.nio.file.Path; /** diff --git a/src/main/java/com/demcha/compose/document/chart/AxisSpec.java b/src/main/java/com/demcha/compose/document/chart/AxisSpec.java index e020ff27c..4bcf358db 100644 --- a/src/main/java/com/demcha/compose/document/chart/AxisSpec.java +++ b/src/main/java/com/demcha/compose/document/chart/AxisSpec.java @@ -11,13 +11,12 @@ * * @param baselineAtZero force the axis to include zero; recommended for bars to * avoid misleading truncated baselines - * @param min explicit lower bound, or {@code null} to derive from data - * @param max explicit upper bound, or {@code null} to derive from data - * @param format number format applied to axis tick labels - * @param showGridLines emit a horizontal grid line per major tick + * @param min explicit lower bound, or {@code null} to derive from data + * @param max explicit upper bound, or {@code null} to derive from data + * @param format number format applied to axis tick labels + * @param showGridLines emit a horizontal grid line per major tick * @param showTickLabels emit the numeric tick label for each major tick; when * {@code false} the value axis reserves no left gutter - * * @author Artem Demchyshyn * @since 1.8.0 */ @@ -29,7 +28,9 @@ public record AxisSpec( boolean showGridLines, boolean showTickLabels ) { - /** Validates explicit bounds and normalizes the format. */ + /** + * Validates explicit bounds and normalizes the format. + */ public AxisSpec { if (min != null && max != null && min >= max) { throw new IllegalArgumentException("axis min must be < max: " + min + " >= " + max); @@ -42,10 +43,10 @@ public record AxisSpec( * showing tick labels). * * @param baselineAtZero include zero - * @param min explicit lower bound or {@code null} - * @param max explicit upper bound or {@code null} - * @param format tick-label number format - * @param showGridLines draw grid lines + * @param min explicit lower bound or {@code null} + * @param max explicit upper bound or {@code null} + * @param format tick-label number format + * @param showGridLines draw grid lines */ public AxisSpec(boolean baselineAtZero, Double min, Double max, NumberFormatSpec format, boolean showGridLines) { @@ -70,7 +71,9 @@ public static Builder builder() { return new Builder(); } - /** Fluent builder for {@link AxisSpec}. */ + /** + * Fluent builder for {@link AxisSpec}. + */ public static final class Builder { private boolean baselineAtZero = true; private Double min; diff --git a/src/main/java/com/demcha/compose/document/chart/BarChartLayout.java b/src/main/java/com/demcha/compose/document/chart/BarChartLayout.java index 228f2c6ff..1014c2a0f 100644 --- a/src/main/java/com/demcha/compose/document/chart/BarChartLayout.java +++ b/src/main/java/com/demcha/compose/document/chart/BarChartLayout.java @@ -3,22 +3,12 @@ import com.demcha.compose.document.node.LineNode; import com.demcha.compose.document.node.ShapeNode; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentPaint; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import java.util.ArrayList; import java.util.List; -import static com.demcha.compose.document.chart.ChartLayoutSupport.GAP; -import static com.demcha.compose.document.chart.ChartLayoutSupport.MIN_BAR_HEIGHT; -import static com.demcha.compose.document.chart.ChartLayoutSupport.emitChipLabel; -import static com.demcha.compose.document.chart.ChartLayoutSupport.inkCenter; -import static com.demcha.compose.document.chart.ChartLayoutSupport.label; -import static com.demcha.compose.document.chart.ChartLayoutSupport.valueLabelGap; +import static com.demcha.compose.document.chart.ChartLayoutSupport.*; /** * Geometry for vertical and horizontal bar charts, grouped or stacked, with diff --git a/src/main/java/com/demcha/compose/document/chart/BarGrouping.java b/src/main/java/com/demcha/compose/document/chart/BarGrouping.java index b66fcf4f4..c7130b103 100644 --- a/src/main/java/com/demcha/compose/document/chart/BarGrouping.java +++ b/src/main/java/com/demcha/compose/document/chart/BarGrouping.java @@ -7,8 +7,12 @@ * @since 1.8.0 */ public enum BarGrouping { - /** Series render side by side inside the category slot. */ + /** + * Series render side by side inside the category slot. + */ GROUPED, - /** Series stack on top of each other; the axis scales to stacked sums. */ + /** + * Series stack on top of each other; the axis scales to stacked sums. + */ STACKED } diff --git a/src/main/java/com/demcha/compose/document/chart/ChartData.java b/src/main/java/com/demcha/compose/document/chart/ChartData.java index ff0655188..6d441b10e 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartData.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartData.java @@ -15,14 +15,15 @@ * authoring time rather than producing a skewed plot.

* * @param categories ordered category (x-axis) labels; at least one - * @param series ordered value series; at least one, each aligned to categories - * + * @param series ordered value series; at least one, each aligned to categories * @author Artem Demchyshyn * @since 1.8.0 */ public record ChartData(List categories, List series) { - /** Defensively copies both lists and enforces the alignment invariant. */ + /** + * Defensively copies both lists and enforces the alignment invariant. + */ public ChartData { Objects.requireNonNull(categories, "categories"); Objects.requireNonNull(series, "series"); @@ -43,6 +44,15 @@ public record ChartData(List categories, List series) { } } + /** + * Starts a mutable builder. + * + * @return new builder + */ + public static Builder builder() { + return new Builder(); + } + /** * Number of value series. * @@ -61,24 +71,17 @@ public int categoryCount() { return categories.size(); } - /** - * Starts a mutable builder. - * - * @return new builder - */ - public static Builder builder() { - return new Builder(); - } - /** * One named value series. {@code null} entries are allowed and mean a * missing point — a gap in a line, a skipped bar — distinct from {@code 0}. * - * @param name legend label for this series + * @param name legend label for this series * @param values value per category, aligned by index; entries may be null */ public record Series(String name, List values) { - /** Normalizes the name and tolerates {@code null} value entries. */ + /** + * Normalizes the name and tolerates {@code null} value entries. + */ public Series { name = name == null ? "" : name; Objects.requireNonNull(values, "values"); @@ -88,7 +91,7 @@ public record Series(String name, List values) { /** * Convenience: build a series from a name and a primitive run. * - * @param name series name + * @param name series name * @param values value run * @return series */ @@ -101,7 +104,9 @@ public static Series of(String name, double... values) { } } - /** Mutable builder; produces an immutable {@link ChartData}. */ + /** + * Mutable builder; produces an immutable {@link ChartData}. + */ public static final class Builder { private final List categories = new ArrayList<>(); private final List series = new ArrayList<>(); @@ -142,7 +147,7 @@ public Builder series(Series s) { /** * Adds a value series from a name and a primitive run. * - * @param name series name + * @param name series name * @param values value run * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java b/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java index 34cc1c2b0..0cb781d5e 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartDefaults.java @@ -23,13 +23,19 @@ */ public final class ChartDefaults { - /** Fraction of a category slot a bar group fills when no style overrides it. */ + /** + * Fraction of a category slot a bar group fills when no style overrides it. + */ public static final double BAR_WIDTH_RATIO = 0.72; - /** Default number of axis tick intervals requested from {@link NiceScale}. */ + /** + * Default number of axis tick intervals requested from {@link NiceScale}. + */ public static final int TARGET_TICKS = 5; - /** Default professional series palette (Tableau-10 inspired, deterministic). */ + /** + * Default professional series palette (Tableau-10 inspired, deterministic). + */ public static final List DEFAULT_PALETTE = List.of( DocumentPaint.solid(DocumentColor.rgb(78, 121, 167)), DocumentPaint.solid(DocumentColor.rgb(242, 142, 43)), @@ -40,25 +46,33 @@ public final class ChartDefaults { DocumentPaint.solid(DocumentColor.rgb(176, 122, 161)), DocumentPaint.solid(DocumentColor.rgb(156, 117, 95))); - /** Default grid line stroke — a thin light-grey rule. */ + /** + * Default grid line stroke — a thin light-grey rule. + */ public static final DocumentStroke DEFAULT_GRID_STROKE = DocumentStroke.of(DocumentColor.rgb(224, 224, 224), 0.5); - /** Default tick / category label style. */ + /** + * Default tick / category label style. + */ public static final DocumentTextStyle AXIS_TEXT_STYLE = DocumentTextStyle.builder() .fontName(FontName.HELVETICA) .size(8) .color(DocumentColor.rgb(90, 90, 90)) .build(); - /** Default legend label style. */ + /** + * Default legend label style. + */ public static final DocumentTextStyle LEGEND_TEXT_STYLE = DocumentTextStyle.builder() .fontName(FontName.HELVETICA) .size(9) .color(DocumentColor.rgb(60, 60, 60)) .build(); - /** Default value-label style. */ + /** + * Default value-label style. + */ public static final DocumentTextStyle VALUE_LABEL_TEXT_STYLE = DocumentTextStyle.builder() .fontName(FontName.HELVETICA) .size(8) @@ -74,21 +88,29 @@ public final class ChartDefaults { public static final DocumentPaint VALUE_LABEL_HALO = DocumentPaint.solid(DocumentColor.WHITE); - /** Default pie/donut slice separator — a white 1pt stroke between slices. */ + /** + * Default pie/donut slice separator — a white 1pt stroke between slices. + */ public static final DocumentStroke SLICE_STROKE = DocumentStroke.of(DocumentColor.WHITE, 1.0); - /** Default donut-centre KPI text style. */ + /** + * Default donut-centre KPI text style. + */ public static final DocumentTextStyle DONUT_CENTER_TEXT_STYLE = DocumentTextStyle.builder() .fontName(FontName.HELVETICA_BOLD) .size(13) .color(DocumentColor.rgb(45, 45, 45)) .build(); - /** Arc tessellation step for pie/donut sector polygons, in degrees. */ + /** + * Arc tessellation step for pie/donut sector polygons, in degrees. + */ public static final double SECTOR_TESSELLATION_STEP_DEGREES = 3.0; - /** Built-in default chart theme used when no document theme is supplied. */ + /** + * Built-in default chart theme used when no document theme is supplied. + */ public static final ChartTheme DEFAULT_THEME = new ChartTheme( DEFAULT_PALETTE, DEFAULT_GRID_STROKE, diff --git a/src/main/java/com/demcha/compose/document/chart/ChartLayoutResolver.java b/src/main/java/com/demcha/compose/document/chart/ChartLayoutResolver.java index c50d8c60f..d64ee6977 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartLayoutResolver.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartLayoutResolver.java @@ -30,11 +30,11 @@ private ChartLayoutResolver() { /** * Resolves a chart spec into positioned primitive children. * - * @param spec what to plot - * @param style fully-coalesced style (theme already merged in) - * @param theme active chart theme (supplies the fallback palette) - * @param width chart inner box width in points - * @param height chart inner box height in points + * @param spec what to plot + * @param style fully-coalesced style (theme already merged in) + * @param theme active chart theme (supplies the fallback palette) + * @param width chart inner box width in points + * @param height chart inner box height in points * @param metrics text measurement seam for label sizing * @return positioned primitive nodes filling the chart box; never null */ diff --git a/src/main/java/com/demcha/compose/document/chart/ChartLayoutSupport.java b/src/main/java/com/demcha/compose/document/chart/ChartLayoutSupport.java index 35a625445..ef63b4e1d 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartLayoutSupport.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartLayoutSupport.java @@ -4,11 +4,7 @@ import com.demcha.compose.document.node.ParagraphNode; import com.demcha.compose.document.node.ShapeNode; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import java.util.ArrayList; import java.util.List; @@ -33,43 +29,14 @@ final class ChartLayoutSupport { static final double DEFAULT_VALUE_LABEL_OFFSET = 2.0; static final double HALO_PAD_X = 2.0; static final double HALO_PAD_Y = 1.0; - /** Cap height as a fraction of font size (Helvetica-class fonts ≈ 0.72em). */ + /** + * Cap height as a fraction of font size (Helvetica-class fonts ≈ 0.72em). + */ static final double CAP_HEIGHT_RATIO = 0.70; private ChartLayoutSupport() { } - /** One legend entry: a swatch colour plus its label. */ - record LegendEntry(String name, DocumentColor color) { - } - - /** Space reserved for the legend on each side of the plot. */ - record LegendReserve(double bottomH, double topH, double rightW) { - static final LegendReserve NONE = new LegendReserve(0, 0, 0); - } - - /** Plot rectangle and scale, all in bottom-up inner-box coordinates. */ - record Frame(NiceScale scale, double plotLeftX, double plotRightX, - double plotBottomY, double plotTopY, - double leftGutter, double legendH, - double axisLineH, double legendLineH, double valueLineH) { - double plotWidth() { - return plotRightX - plotLeftX; - } - - double plotHeight() { - return plotTopY - plotBottomY; - } - - double yForValue(double value) { - return plotBottomY + scale.fractionOf(value) * plotHeight(); - } - - double plotCenterY() { - return (plotBottomY + plotTopY) / 2.0; - } - } - static List seriesLegendEntries(ChartData data, ChartStyle style, ChartTheme theme) { List entries = new ArrayList<>(data.seriesCount()); @@ -81,7 +48,9 @@ static List seriesLegendEntries(ChartData data, ChartStyle style, return entries; } - /** Computes the strip/column space the legend reserves around the plot. */ + /** + * Computes the strip/column space the legend reserves around the plot. + */ static LegendReserve legendReserve(LegendPosition position, List entries, ChartStyle style, ChartTextMetrics metrics) { if (position == LegendPosition.NONE || entries.isEmpty()) { @@ -191,7 +160,7 @@ static double[] domain(ChartData data, boolean stacked, boolean includeZero) { min = Math.min(min, 0.0); max = Math.max(max, 0.0); } - return new double[] {min, max}; + return new double[]{min, max}; } static void emitGridAndTicks(List out, Frame f, AxisSpec axis, @@ -220,7 +189,9 @@ static void emitGridAndTicks(List out, Frame f, AxisSpec axis, } } - /** Emits one vertical category-separator grid line per inner slot boundary. */ + /** + * Emits one vertical category-separator grid line per inner slot boundary. + */ static void emitVerticalGrid(List out, Frame f, int categoryCount, ChartStyle style) { DocumentStroke stroke = style.grid() == null ? null : style.grid().vertical(); @@ -316,7 +287,9 @@ private static void emitLegendEntry(List out, LegendEntry entry, x + SWATCH_SIZE + SWATCH_LABEL_GAP, labelBottom, labelW, legendLineH)); } - /** Emits an optional halo chip followed by a centred label box. */ + /** + * Emits an optional halo chip followed by a centred label box. + */ static void emitChipLabel(List out, String name, String text, DocumentTextStyle textStyle, DocumentColor halo, double centerX, double yBottom, double labelW, double lineH) { @@ -370,4 +343,41 @@ static void requireSupportedValueLabels(ValueLabelMode mode) { "ValueLabelMode.INSIDE is not yet supported; use OUTSIDE or NONE"); } } + + /** + * One legend entry: a swatch colour plus its label. + */ + record LegendEntry(String name, DocumentColor color) { + } + + /** + * Space reserved for the legend on each side of the plot. + */ + record LegendReserve(double bottomH, double topH, double rightW) { + static final LegendReserve NONE = new LegendReserve(0, 0, 0); + } + + /** + * Plot rectangle and scale, all in bottom-up inner-box coordinates. + */ + record Frame(NiceScale scale, double plotLeftX, double plotRightX, + double plotBottomY, double plotTopY, + double leftGutter, double legendH, + double axisLineH, double legendLineH, double valueLineH) { + double plotWidth() { + return plotRightX - plotLeftX; + } + + double plotHeight() { + return plotTopY - plotBottomY; + } + + double yForValue(double value) { + return plotBottomY + scale.fractionOf(value) * plotHeight(); + } + + double plotCenterY() { + return (plotBottomY + plotTopY) / 2.0; + } + } } diff --git a/src/main/java/com/demcha/compose/document/chart/ChartPrimitive.java b/src/main/java/com/demcha/compose/document/chart/ChartPrimitive.java index 32de15821..b4b6296c0 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartPrimitive.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartPrimitive.java @@ -16,17 +16,18 @@ * within (matching the node's intrinsic size for shapes and lines, and the * label box for paragraphs).

* - * @param node the primitive node (bar, line segment, grid line, label, swatch) - * @param x left edge of the box, points from the inner box's left edge - * @param y bottom edge of the box, points from the inner box's bottom edge - * @param width box width in points (positive) + * @param node the primitive node (bar, line segment, grid line, label, swatch) + * @param x left edge of the box, points from the inner box's left edge + * @param y bottom edge of the box, points from the inner box's bottom edge + * @param width box width in points (positive) * @param height box height in points (positive) - * * @author Artem Demchyshyn * @since 1.8.0 */ public record ChartPrimitive(DocumentNode node, double x, double y, double width, double height) { - /** Validates the node reference, finite coordinates, and positive box. */ + /** + * Validates the node reference, finite coordinates, and positive box. + */ public ChartPrimitive { Objects.requireNonNull(node, "node"); requireFinite(x, "x"); diff --git a/src/main/java/com/demcha/compose/document/chart/ChartSize.java b/src/main/java/com/demcha/compose/document/chart/ChartSize.java index 39d7f235a..a46f21447 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartSize.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartSize.java @@ -10,14 +10,6 @@ */ public sealed interface ChartSize permits ChartSize.Fixed, ChartSize.AspectRatio { - /** - * Resolves the chart height in points. - * - * @param availableWidth width handed down by the layout pass - * @return chart height in points - */ - double resolveHeight(double availableWidth); - /** * Height fixed in points regardless of width. * @@ -39,20 +31,31 @@ static ChartSize aspectRatio(double w, double h) { return new AspectRatio(w, h); } + /** + * Resolves the chart height in points. + * + * @param availableWidth width handed down by the layout pass + * @return chart height in points + */ + double resolveHeight(double availableWidth); + /** * Fixed-height policy. * * @param points height in points */ record Fixed(double points) implements ChartSize { - /** Validates the fixed height. */ + /** + * Validates the fixed height. + */ public Fixed { if (points <= 0 || Double.isNaN(points) || Double.isInfinite(points)) { throw new IllegalArgumentException("fixed height must be finite and positive: " + points); } } - @Override public double resolveHeight(double availableWidth) { + @Override + public double resolveHeight(double availableWidth) { return points; } } @@ -64,14 +67,17 @@ record Fixed(double points) implements ChartSize { * @param h ratio height term */ record AspectRatio(double w, double h) implements ChartSize { - /** Validates the ratio terms. */ + /** + * Validates the ratio terms. + */ public AspectRatio { if (w <= 0 || h <= 0 || Double.isNaN(w) || Double.isNaN(h)) { throw new IllegalArgumentException("aspect ratio sides must be positive: " + w + ":" + h); } } - @Override public double resolveHeight(double availableWidth) { + @Override + public double resolveHeight(double availableWidth) { return availableWidth * (h / w); } } diff --git a/src/main/java/com/demcha/compose/document/chart/ChartSpec.java b/src/main/java/com/demcha/compose/document/chart/ChartSpec.java index d1a21bad0..6e52aa2c3 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartSpec.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartSpec.java @@ -19,6 +19,33 @@ */ public sealed interface ChartSpec permits ChartSpec.Bar, ChartSpec.Line, ChartSpec.Pie { + /** + * Starts a bar-chart builder. + * + * @return bar builder + */ + static Bar.Builder bar() { + return new Bar.Builder(); + } + + /** + * Starts a line-chart builder. + * + * @return line builder + */ + static Line.Builder line() { + return new Line.Builder(); + } + + /** + * Starts a pie/donut-chart builder. + * + * @return pie builder + */ + static Pie.Builder pie() { + return new Pie.Builder(); + } + /** * Tabular data backing this chart. * @@ -49,43 +76,16 @@ public sealed interface ChartSpec permits ChartSpec.Bar, ChartSpec.Line, ChartSp */ ChartSize size(); - /** - * Starts a bar-chart builder. - * - * @return bar builder - */ - static Bar.Builder bar() { - return new Bar.Builder(); - } - - /** - * Starts a line-chart builder. - * - * @return line builder - */ - static Line.Builder line() { - return new Line.Builder(); - } - - /** - * Starts a pie/donut-chart builder. - * - * @return pie builder - */ - static Pie.Builder pie() { - return new Pie.Builder(); - } - /** * Bar chart: vertical or horizontal, grouped or stacked. * - * @param data tabular data - * @param horizontal true = bars run horizontally (categories on y) - * @param grouping side-by-side vs stacked when multiple series - * @param valueAxis numeric-axis configuration - * @param legend legend placement - * @param valueLabels per-bar value label mode - * @param size width-responsive sizing policy + * @param data tabular data + * @param horizontal true = bars run horizontally (categories on y) + * @param grouping side-by-side vs stacked when multiple series + * @param valueAxis numeric-axis configuration + * @param legend legend placement + * @param valueLabels per-bar value label mode + * @param size width-responsive sizing policy * @param showCategoryLabels emit the category (x-axis) label under each slot */ record Bar( @@ -98,7 +98,9 @@ record Bar( ChartSize size, boolean showCategoryLabels ) implements ChartSpec { - /** Normalizes structural defaults. */ + /** + * Normalizes structural defaults. + */ public Bar { Objects.requireNonNull(data, "data"); grouping = grouping == null ? BarGrouping.GROUPED : grouping; @@ -108,29 +110,31 @@ record Bar( size = size == null ? ChartSize.aspectRatio(16, 9) : size; } - @Override - public NumberFormatSpec valueFormat() { - return valueAxis.format(); - } - /** * Backward-compatible constructor without the category-label toggle * (defaults to showing category labels). * - * @param data tabular data - * @param horizontal horizontal orientation - * @param grouping multi-series grouping - * @param valueAxis numeric-axis configuration - * @param legend legend placement + * @param data tabular data + * @param horizontal horizontal orientation + * @param grouping multi-series grouping + * @param valueAxis numeric-axis configuration + * @param legend legend placement * @param valueLabels per-bar value label mode - * @param size sizing policy + * @param size sizing policy */ public Bar(ChartData data, boolean horizontal, BarGrouping grouping, AxisSpec valueAxis, LegendPosition legend, ValueLabelMode valueLabels, ChartSize size) { this(data, horizontal, grouping, valueAxis, legend, valueLabels, size, true); } - /** Fluent builder for a {@link Bar} spec. */ + @Override + public NumberFormatSpec valueFormat() { + return valueAxis.format(); + } + + /** + * Fluent builder for a {@link Bar} spec. + */ public static final class Builder { private ChartData data; private boolean horizontal = false; @@ -245,14 +249,14 @@ public Bar build() { * Line chart: one polyline per series, optional point markers (markers come * from {@link ChartStyle#pointMarker()} so the geometry is reused). * - * @param data tabular data - * @param smooth true = curved (Catmull-Rom) segments; false = straight - * @param area fill the region between each series and the axis baseline - * (translucent series colour; see {@code ChartStyle.areaOpacity}) - * @param valueAxis numeric-axis configuration - * @param legend legend placement - * @param valueLabels per-point value label mode - * @param size width-responsive sizing policy + * @param data tabular data + * @param smooth true = curved (Catmull-Rom) segments; false = straight + * @param area fill the region between each series and the axis baseline + * (translucent series colour; see {@code ChartStyle.areaOpacity}) + * @param valueAxis numeric-axis configuration + * @param legend legend placement + * @param valueLabels per-point value label mode + * @param size width-responsive sizing policy * @param showCategoryLabels emit the category (x-axis) label under each slot */ record Line( @@ -265,7 +269,9 @@ record Line( ChartSize size, boolean showCategoryLabels ) implements ChartSpec { - /** Normalizes structural defaults. */ + /** + * Normalizes structural defaults. + */ public Line { Objects.requireNonNull(data, "data"); valueAxis = valueAxis == null ? AxisSpec.defaults() : valueAxis; @@ -274,28 +280,30 @@ record Line( size = size == null ? ChartSize.aspectRatio(16, 9) : size; } - @Override - public NumberFormatSpec valueFormat() { - return valueAxis.format(); - } - /** * Backward-compatible constructor without the area and category-label * toggles (no area fill; category labels shown). * - * @param data tabular data - * @param smooth curved segments - * @param valueAxis numeric-axis configuration - * @param legend legend placement + * @param data tabular data + * @param smooth curved segments + * @param valueAxis numeric-axis configuration + * @param legend legend placement * @param valueLabels per-point value label mode - * @param size sizing policy + * @param size sizing policy */ public Line(ChartData data, boolean smooth, AxisSpec valueAxis, LegendPosition legend, ValueLabelMode valueLabels, ChartSize size) { this(data, smooth, false, valueAxis, legend, valueLabels, size, true); } - /** Fluent builder for a {@link Line} spec. */ + @Override + public NumberFormatSpec valueFormat() { + return valueAxis.format(); + } + + /** + * Fluent builder for a {@link Line} spec. + */ public static final class Builder { private ChartData data; private boolean smooth = false; @@ -415,19 +423,19 @@ public Line build() { * unrepresentable here by design — the spec carries its own value/percent * formats instead. * - * @param data tabular data; must contain exactly one series - * @param donutRatio 0 for a solid pie; (0..0.9] = hole radius as a fraction - * of the outer radius + * @param data tabular data; must contain exactly one series + * @param donutRatio 0 for a solid pie; (0..0.9] = hole radius as a fraction + * of the outer radius * @param startAngleDegrees angle of the first slice's leading edge * (90 = twelve o'clock) - * @param clockwise slice layout direction - * @param sliceLabels what each slice's outside label shows - * @param valueFormat format for {@link SliceLabelMode#VALUE} labels - * @param percentFormat format for percent labels (suffix included) - * @param centerText optional KPI text in the donut hole; requires - * {@code donutRatio > 0} - * @param legend legend placement; lists category names - * @param size width-responsive sizing policy (1:1 by default) + * @param clockwise slice layout direction + * @param sliceLabels what each slice's outside label shows + * @param valueFormat format for {@link SliceLabelMode#VALUE} labels + * @param percentFormat format for percent labels (suffix included) + * @param centerText optional KPI text in the donut hole; requires + * {@code donutRatio > 0} + * @param legend legend placement; lists category names + * @param size width-responsive sizing policy (1:1 by default) */ record Pie( ChartData data, @@ -441,7 +449,9 @@ record Pie( LegendPosition legend, ChartSize size ) implements ChartSpec { - /** Validates the single-series invariant and the ratio/angle ranges. */ + /** + * Validates the single-series invariant and the ratio/angle ranges. + */ public Pie { Objects.requireNonNull(data, "data"); if (data.seriesCount() != 1) { @@ -467,7 +477,9 @@ record Pie( } } - /** Fluent builder for a {@link Pie} spec. */ + /** + * Fluent builder for a {@link Pie} spec. + */ public static final class Builder { private ChartData data; private double donutRatio = 0.0; diff --git a/src/main/java/com/demcha/compose/document/chart/ChartStyle.java b/src/main/java/com/demcha/compose/document/chart/ChartStyle.java index 2c2b91534..7f6bc5314 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartStyle.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartStyle.java @@ -31,32 +31,31 @@ * the gradient work), the {@link PointMarker} ellipse marker, and the small * {@link GridStyle} record below.

* - * @param palette ordered series paints + * @param palette ordered series paints * @param seriesPaintOverrides explicit per-series paint by zero-based index - * @param lineWidth stroke width for line series in points, or {@code null} for - * the default; series colour always comes from the paint cascade - * @param barCornerRadius per-bar corner radius, or {@code null} - * @param barWidthRatio fraction (0,1] of the category slot a bar group fills - * @param grid grid-line configuration - * @param pointMarker ellipse marker drawn at every line-chart data point, or - * {@code null} for none; see {@link PointMarker} - * @param valueLabelOffset gap in points between a bar top / point marker and its - * value label, or {@code null} for the default - * @param axisTextStyle tick / category label style - * @param legendTextStyle legend label style - * @param valueLabelTextStyle value-label style - * @param valueLabelHalo halo chip painted behind line-chart value labels so the - * digits stay legible where line strokes cross them; match - * it to the chart's surface colour on non-white backgrounds - * @param areaOpacity opacity of the area fill under {@code ChartSpec.line().area(true)} - * series, in (0..1], or {@code null} for the default (0.35) - * @param sliceStroke pie/donut slice separator stroke, or {@code null} for the - * themed default (white 1pt) - * @param sliceGapDegrees angular gap between pie/donut slices (pad angle), or - * {@code null} for none + * @param lineWidth stroke width for line series in points, or {@code null} for + * the default; series colour always comes from the paint cascade + * @param barCornerRadius per-bar corner radius, or {@code null} + * @param barWidthRatio fraction (0,1] of the category slot a bar group fills + * @param grid grid-line configuration + * @param pointMarker ellipse marker drawn at every line-chart data point, or + * {@code null} for none; see {@link PointMarker} + * @param valueLabelOffset gap in points between a bar top / point marker and its + * value label, or {@code null} for the default + * @param axisTextStyle tick / category label style + * @param legendTextStyle legend label style + * @param valueLabelTextStyle value-label style + * @param valueLabelHalo halo chip painted behind line-chart value labels so the + * digits stay legible where line strokes cross them; match + * it to the chart's surface colour on non-white backgrounds + * @param areaOpacity opacity of the area fill under {@code ChartSpec.line().area(true)} + * series, in (0..1], or {@code null} for the default (0.35) + * @param sliceStroke pie/donut slice separator stroke, or {@code null} for the + * themed default (white 1pt) + * @param sliceGapDegrees angular gap between pie/donut slices (pad angle), or + * {@code null} for none * @param donutCenterTextStyle style for the donut-centre KPI text, or * {@code null} for the themed default - * * @author Artem Demchyshyn * @since 1.8.0 */ @@ -78,7 +77,9 @@ public record ChartStyle( Double sliceGapDegrees, DocumentTextStyle donutCenterTextStyle ) { - /** Copy-protects collections and validates ratio bounds. */ + /** + * Copy-protects collections and validates ratio bounds. + */ public ChartStyle { palette = palette == null ? List.of() : List.copyOf(palette); seriesPaintOverrides = seriesPaintOverrides == null @@ -90,7 +91,7 @@ public record ChartStyle( throw new IllegalArgumentException("barWidthRatio must be in (0,1]: " + barWidthRatio); } if (valueLabelOffset != null && (valueLabelOffset < 0 - || valueLabelOffset.isNaN() || valueLabelOffset.isInfinite())) { + || valueLabelOffset.isNaN() || valueLabelOffset.isInfinite())) { throw new IllegalArgumentException( "valueLabelOffset must be finite and non-negative: " + valueLabelOffset); } @@ -98,7 +99,7 @@ public record ChartStyle( throw new IllegalArgumentException("areaOpacity must be in (0,1]: " + areaOpacity); } if (sliceGapDegrees != null && (sliceGapDegrees < 0 || sliceGapDegrees > 30 - || sliceGapDegrees.isNaN())) { + || sliceGapDegrees.isNaN())) { throw new IllegalArgumentException( "sliceGapDegrees must be in [0, 30]: " + sliceGapDegrees); } @@ -163,7 +164,7 @@ public ChartStyle mergedUnder(ChartStyle top) { * the style palette, then the supplied fallback palette, cycling by modulo so * a chart never runs out of colours. * - * @param index zero-based series index + * @param index zero-based series index * @param fallbackPalette palette to use when neither override nor style palette applies * @return the paint to fill / stroke this series with */ @@ -184,7 +185,7 @@ public DocumentPaint paintForSeries(int index, List fallbackPalet * grid family entirely. * * @param horizontal stroke for horizontal grid lines (value gridlines) - * @param vertical stroke for vertical grid lines (category separators) + * @param vertical stroke for vertical grid lines (category separators) */ public record GridStyle(DocumentStroke horizontal, DocumentStroke vertical) { /** @@ -207,7 +208,9 @@ public static GridStyle none() { } } - /** Fluent builder; all setters optional. */ + /** + * Fluent builder; all setters optional. + */ public static final class Builder { private final List palette = new ArrayList<>(); private final Map overrides = new HashMap<>(); diff --git a/src/main/java/com/demcha/compose/document/chart/ChartTextMetrics.java b/src/main/java/com/demcha/compose/document/chart/ChartTextMetrics.java index 4230faae6..132290637 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartTextMetrics.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartTextMetrics.java @@ -21,7 +21,7 @@ public interface ChartTextMetrics { * Measures the rendered width of {@code text} in the supplied style. * * @param style text style - * @param text text to measure + * @param text text to measure * @return width in points */ double width(DocumentTextStyle style, String text); diff --git a/src/main/java/com/demcha/compose/document/chart/ChartTheme.java b/src/main/java/com/demcha/compose/document/chart/ChartTheme.java index 26ca338ff..61ffbef88 100644 --- a/src/main/java/com/demcha/compose/document/chart/ChartTheme.java +++ b/src/main/java/com/demcha/compose/document/chart/ChartTheme.java @@ -15,14 +15,13 @@ * with no {@link ChartStyle} still matches the document's palette and typography * automatically. * - * @param palette ordered series paints; cycled by the resolver - * @param gridStroke default grid line stroke - * @param axisTextStyle default tick / category label style - * @param legendTextStyle default legend label style + * @param palette ordered series paints; cycled by the resolver + * @param gridStroke default grid line stroke + * @param axisTextStyle default tick / category label style + * @param legendTextStyle default legend label style * @param valueLabelTextStyle default value-label style - * @param valueLabelHalo default halo chip painted behind line-chart value labels - * so digits stay legible where line strokes cross them - * + * @param valueLabelHalo default halo chip painted behind line-chart value labels + * so digits stay legible where line strokes cross them * @author Artem Demchyshyn * @since 1.8.0 */ @@ -34,7 +33,9 @@ public record ChartTheme( DocumentTextStyle valueLabelTextStyle, DocumentPaint valueLabelHalo ) { - /** Copy-protects and validates the palette. */ + /** + * Copy-protects and validates the palette. + */ public ChartTheme { Objects.requireNonNull(palette, "palette"); palette = List.copyOf(palette); diff --git a/src/main/java/com/demcha/compose/document/chart/LegendPosition.java b/src/main/java/com/demcha/compose/document/chart/LegendPosition.java index 07ab5d6d8..f1d1e6f8f 100644 --- a/src/main/java/com/demcha/compose/document/chart/LegendPosition.java +++ b/src/main/java/com/demcha/compose/document/chart/LegendPosition.java @@ -12,12 +12,20 @@ * @since 1.8.0 */ public enum LegendPosition { - /** No legend is rendered. */ + /** + * No legend is rendered. + */ NONE, - /** Single legend row below the plot area. */ + /** + * Single legend row below the plot area. + */ BOTTOM, - /** Reserved — legend column to the right of the plot area. */ + /** + * Reserved — legend column to the right of the plot area. + */ RIGHT, - /** Reserved — single legend row above the plot area. */ + /** + * Reserved — single legend row above the plot area. + */ TOP } diff --git a/src/main/java/com/demcha/compose/document/chart/LineChartLayout.java b/src/main/java/com/demcha/compose/document/chart/LineChartLayout.java index 2d5d7ac89..cc0639721 100644 --- a/src/main/java/com/demcha/compose/document/chart/LineChartLayout.java +++ b/src/main/java/com/demcha/compose/document/chart/LineChartLayout.java @@ -2,19 +2,12 @@ import com.demcha.compose.document.node.EllipseNode; import com.demcha.compose.document.node.PolygonNode; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.style.ShapePoint; +import com.demcha.compose.document.style.*; import java.util.ArrayList; import java.util.List; -import static com.demcha.compose.document.chart.ChartLayoutSupport.DEFAULT_LINE_WIDTH; -import static com.demcha.compose.document.chart.ChartLayoutSupport.emitChipLabel; -import static com.demcha.compose.document.chart.ChartLayoutSupport.segment; -import static com.demcha.compose.document.chart.ChartLayoutSupport.valueLabelGap; +import static com.demcha.compose.document.chart.ChartLayoutSupport.*; /** * Geometry for line charts: straight or Catmull-Rom-smoothed polylines, @@ -26,7 +19,9 @@ */ final class LineChartLayout { - /** Sub-segments per Catmull-Rom span; fixed so geometry stays deterministic. */ + /** + * Sub-segments per Catmull-Rom span; fixed so geometry stays deterministic. + */ private static final int SMOOTH_SUBDIVISIONS = 8; private static final double DEFAULT_AREA_OPACITY = 0.35; @@ -137,7 +132,9 @@ static List resolve(ChartSpec.Line line, ChartStyle style, return out; } - /** Splits a series into contiguous non-null runs of (x, y) samples. */ + /** + * Splits a series into contiguous non-null runs of (x, y) samples. + */ private static List> sampleSeries(ChartData.Series series, ChartLayoutSupport.Frame f, double slotW, boolean smooth) { @@ -152,7 +149,7 @@ private static List> sampleSeries(ChartData.Series series, } continue; } - current.add(new double[] { + current.add(new double[]{ f.plotLeftX() + (c + 0.5) * slotW, f.yForValue(v)}); } if (!current.isEmpty()) { @@ -179,7 +176,7 @@ private static List smoothRun(List points) { double[] p3 = points.get(Math.min(points.size() - 1, i + 2)); for (int t = 1; t <= SMOOTH_SUBDIVISIONS; t++) { double u = (double) t / SMOOTH_SUBDIVISIONS; - samples.add(new double[] { + samples.add(new double[]{ catmullRom(p0[0], p1[0], p2[0], p3[0], u), catmullRom(p0[1], p1[1], p2[1], p3[1], u)}); } @@ -191,12 +188,14 @@ private static double catmullRom(double p0, double p1, double p2, double p3, dou double t2 = t * t; double t3 = t2 * t; return 0.5 * ((2 * p1) - + (-p0 + p2) * t - + (2 * p0 - 5 * p1 + 4 * p2 - p3) * t2 - + (-p0 + 3 * p1 - 3 * p2 + p3) * t3); + + (-p0 + p2) * t + + (2 * p0 - 5 * p1 + 4 * p2 - p3) * t2 + + (-p0 + 3 * p1 - 3 * p2 + p3) * t3); } - /** Closes a sampled run down to the plot baseline and emits it as a polygon. */ + /** + * Closes a sampled run down to the plot baseline and emits it as a polygon. + */ private static void emitAreaPolygon(List out, String name, List run, double baselineY, DocumentColor fill) { @@ -248,7 +247,7 @@ private static void emitValueLabels(List out, ChartLayoutSupport List order = new ArrayList<>(); for (int s = 0; s < data.seriesCount(); s++) { if (data.series().get(s).values().get(c) != null) { - order.add(new int[] {s}); + order.add(new int[]{s}); } } int catIndex = c; @@ -272,7 +271,7 @@ private static void emitValueLabels(List out, ChartLayoutSupport // Flip below the point; close series read better split around it. yBottom = py - markerHalfH - labelGap - f.valueLineH(); } - placedBoxes.add(new double[] {yBottom, yBottom + f.valueLineH()}); + placedBoxes.add(new double[]{yBottom, yBottom + f.valueLineH()}); emitChipLabel(out, "value_s" + s + "_c" + c, text, valueStyle, halo, px, yBottom, labelW, f.valueLineH()); } diff --git a/src/main/java/com/demcha/compose/document/chart/NiceScale.java b/src/main/java/com/demcha/compose/document/chart/NiceScale.java index 2d9bc0b38..e7dcfff31 100644 --- a/src/main/java/com/demcha/compose/document/chart/NiceScale.java +++ b/src/main/java/com/demcha/compose/document/chart/NiceScale.java @@ -7,11 +7,10 @@ * machine or locale — this is the keystone of chart determinism, and it is * unit-tested in isolation with golden tables before any rendering is involved. * - * @param niceMin rounded lower bound - * @param niceMax rounded upper bound - * @param tickStep distance between successive ticks + * @param niceMin rounded lower bound + * @param niceMax rounded upper bound + * @param tickStep distance between successive ticks * @param tickCount number of tick marks ({@code niceMin .. niceMax} inclusive) - * * @author Artem Demchyshyn * @since 1.8.0 */ @@ -20,8 +19,8 @@ public record NiceScale(double niceMin, double niceMax, double tickStep, int tic /** * Computes a nice scale. * - * @param dataMin smallest value to cover - * @param dataMax largest value to cover + * @param dataMin smallest value to cover + * @param dataMax largest value to cover * @param includeZero pull the range to include zero (bars) * @param targetTicks desired number of intervals (e.g. 5); a hint, not exact * @return rounded bounds and step diff --git a/src/main/java/com/demcha/compose/document/chart/NumberFormatSpec.java b/src/main/java/com/demcha/compose/document/chart/NumberFormatSpec.java index 9fa9d3360..fd85f8fbf 100644 --- a/src/main/java/com/demcha/compose/document/chart/NumberFormatSpec.java +++ b/src/main/java/com/demcha/compose/document/chart/NumberFormatSpec.java @@ -12,12 +12,11 @@ * "k / M" abbreviation without an escape hatch. Java-only callers that truly * need arbitrary formatting can still pre-format their {@link ChartData} labels.

* - * @param pattern {@link java.text.DecimalFormat} pattern, e.g. {@code "#,##0.0"} - * @param locale grouping/decimal-separator locale; defaults to {@link Locale#ROOT} - * @param prefix text prepended to every formatted value (e.g. {@code "$"}) - * @param suffix text appended to every formatted value (e.g. {@code " k"}) + * @param pattern {@link java.text.DecimalFormat} pattern, e.g. {@code "#,##0.0"} + * @param locale grouping/decimal-separator locale; defaults to {@link Locale#ROOT} + * @param prefix text prepended to every formatted value (e.g. {@code "$"}) + * @param suffix text appended to every formatted value (e.g. {@code " k"}) * @param scaleDivisor value is divided by this before formatting; must be finite and non-zero - * * @author Artem Demchyshyn * @since 1.8.0 */ @@ -28,7 +27,9 @@ public record NumberFormatSpec( String suffix, double scaleDivisor ) { - /** Normalizes nullable fields and rejects a zero / non-finite divisor. */ + /** + * Normalizes nullable fields and rejects a zero / non-finite divisor. + */ public NumberFormatSpec { pattern = (pattern == null || pattern.isBlank()) ? "#,##0.##" : pattern; locale = locale == null ? Locale.ROOT : locale; diff --git a/src/main/java/com/demcha/compose/document/chart/PieChartLayout.java b/src/main/java/com/demcha/compose/document/chart/PieChartLayout.java index 8a7cc72cb..0e1b7b965 100644 --- a/src/main/java/com/demcha/compose/document/chart/PieChartLayout.java +++ b/src/main/java/com/demcha/compose/document/chart/PieChartLayout.java @@ -2,20 +2,12 @@ import com.demcha.compose.document.node.PolygonNode; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.style.ShapePoint; +import com.demcha.compose.document.style.*; import java.util.ArrayList; import java.util.List; -import static com.demcha.compose.document.chart.ChartLayoutSupport.GAP; -import static com.demcha.compose.document.chart.ChartLayoutSupport.HALO_PAD_Y; -import static com.demcha.compose.document.chart.ChartLayoutSupport.emitChipLabel; -import static com.demcha.compose.document.chart.ChartLayoutSupport.label; -import static com.demcha.compose.document.chart.ChartLayoutSupport.valueLabelGap; +import static com.demcha.compose.document.chart.ChartLayoutSupport.*; /** * Geometry for pie/donut charts: arc-tessellated sector polygons, mid-angle diff --git a/src/main/java/com/demcha/compose/document/chart/PointMarker.java b/src/main/java/com/demcha/compose/document/chart/PointMarker.java index 20584502d..309fdfbaf 100644 --- a/src/main/java/com/demcha/compose/document/chart/PointMarker.java +++ b/src/main/java/com/demcha/compose/document/chart/PointMarker.java @@ -14,17 +14,18 @@ * ring (a white ring over a coloured line is the classic way to keep * overlapping joints readable).

* - * @param width marker width (horizontal axis) in points + * @param width marker width (horizontal axis) in points * @param height marker height (vertical axis) in points - * @param fill explicit marker fill, or {@code null} to use the series paint + * @param fill explicit marker fill, or {@code null} to use the series paint * @param stroke outline ring, or {@code null} for none - * * @author Artem Demchyshyn * @since 1.8.0 */ public record PointMarker(double width, double height, DocumentPaint fill, DocumentStroke stroke) { - /** Validates marker axes. */ + /** + * Validates marker axes. + */ public PointMarker { requirePositiveFinite(width, "width"); requirePositiveFinite(height, "height"); @@ -43,7 +44,7 @@ public static PointMarker circle(double diameter) { /** * Elliptical marker filled with the series paint. * - * @param width horizontal axis in points + * @param width horizontal axis in points * @param height vertical axis in points * @return marker */ @@ -51,6 +52,12 @@ public static PointMarker ellipse(double width, double height) { return new PointMarker(width, height, null, null); } + private static void requirePositiveFinite(double v, String name) { + if (v <= 0 || Double.isNaN(v) || Double.isInfinite(v)) { + throw new IllegalArgumentException(name + " must be finite and positive: " + v); + } + } + /** * Returns a copy with an explicit fill (overrides the series paint). * @@ -70,10 +77,4 @@ public PointMarker withFill(DocumentPaint fill) { public PointMarker withStroke(DocumentStroke stroke) { return new PointMarker(width, height, fill, stroke); } - - private static void requirePositiveFinite(double v, String name) { - if (v <= 0 || Double.isNaN(v) || Double.isInfinite(v)) { - throw new IllegalArgumentException(name + " must be finite and positive: " + v); - } - } } diff --git a/src/main/java/com/demcha/compose/document/chart/SliceLabelMode.java b/src/main/java/com/demcha/compose/document/chart/SliceLabelMode.java index d964adfbe..4535e215e 100644 --- a/src/main/java/com/demcha/compose/document/chart/SliceLabelMode.java +++ b/src/main/java/com/demcha/compose/document/chart/SliceLabelMode.java @@ -8,14 +8,24 @@ * @since 1.8.0 */ public enum SliceLabelMode { - /** No slice labels. */ + /** + * No slice labels. + */ NONE, - /** The raw value, formatted with the spec's value format. */ + /** + * The raw value, formatted with the spec's value format. + */ VALUE, - /** The slice's share of the total, formatted with the spec's percent format. */ + /** + * The slice's share of the total, formatted with the spec's percent format. + */ PERCENT, - /** The category name. */ + /** + * The category name. + */ CATEGORY, - /** Category name followed by the percent share. */ + /** + * Category name followed by the percent share. + */ CATEGORY_PERCENT } diff --git a/src/main/java/com/demcha/compose/document/chart/ValueLabelMode.java b/src/main/java/com/demcha/compose/document/chart/ValueLabelMode.java index a04a625c6..bdc68bdc1 100644 --- a/src/main/java/com/demcha/compose/document/chart/ValueLabelMode.java +++ b/src/main/java/com/demcha/compose/document/chart/ValueLabelMode.java @@ -7,10 +7,16 @@ * @since 1.8.0 */ public enum ValueLabelMode { - /** No value labels. */ + /** + * No value labels. + */ NONE, - /** Above a vertical bar / above a line point. */ + /** + * Above a vertical bar / above a line point. + */ OUTSIDE, - /** Reserved — inside the bar body near its end. */ + /** + * Reserved — inside the bar body near its end. + */ INSIDE } diff --git a/src/main/java/com/demcha/compose/document/debug/snapshot/LayoutGraphSnapshotExtractor.java b/src/main/java/com/demcha/compose/document/debug/snapshot/LayoutGraphSnapshotExtractor.java index 8879ecd87..54d163beb 100644 --- a/src/main/java/com/demcha/compose/document/debug/snapshot/LayoutGraphSnapshotExtractor.java +++ b/src/main/java/com/demcha/compose/document/debug/snapshot/LayoutGraphSnapshotExtractor.java @@ -11,7 +11,6 @@ import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.List; import java.util.Objects; /** diff --git a/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java b/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java index 3c548938a..bf4fdb414 100644 --- a/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/AbstractFlowBuilder.java @@ -5,17 +5,11 @@ import com.demcha.compose.document.dsl.internal.BuilderSupport; import com.demcha.compose.document.image.DocumentImageData; import com.demcha.compose.document.node.ChartNode; -import com.demcha.compose.document.node.DocumentBookmarkOptions; import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.style.DocumentBorders; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; - -import java.awt.Color; +import com.demcha.compose.document.style.*; + +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -29,8 +23,8 @@ * @since 1.0.0 */ public abstract class AbstractFlowBuilder, N extends DocumentNode> { - private String name = ""; private final List children = new ArrayList<>(); + private String name = ""; private double spacing = 0.0; private DocumentInsets padding = DocumentInsets.zero(); private DocumentInsets margin = DocumentInsets.zero(); @@ -85,10 +79,10 @@ public T padding(DocumentInsets padding) { /** * Sets flow padding from explicit side values. * - * @param top top padding - * @param right right padding + * @param top top padding + * @param right right padding * @param bottom bottom padding - * @param left left padding + * @param left left padding * @return this builder */ public T padding(float top, float right, float bottom, float left) { @@ -109,10 +103,10 @@ public T margin(DocumentInsets margin) { /** * Sets flow margin from explicit side values. * - * @param top top margin - * @param right right margin + * @param top top margin + * @param right right margin * @param bottom bottom margin - * @param left left margin + * @param left left margin * @return this builder */ public T margin(float top, float right, float bottom, float left) { @@ -210,8 +204,8 @@ public T band(DocumentColor color) { * padding. Pass {@code 0.0} for {@code radius} or {@code padding} to skip * either step.

* - * @param color panel fill color - * @param radius corner radius in points + * @param color panel fill color + * @param radius corner radius in points * @param padding inner padding in points (applied uniformly on all sides) * @return this builder */ @@ -232,12 +226,12 @@ public T softPanel(DocumentColor color, double radius, double padding) { * side — e.g. a hero block that sits flush against a left accent * strip and only rounds its right corners. * - * @param color panel fill color + * @param color panel fill color * @param cornerRadius per-corner radii (use the * {@link DocumentCornerRadius#right(double)} / * {@code .left} / {@code .top} / {@code .bottom} * factories for asymmetric layouts) - * @param padding inner padding in points (applied uniformly on all sides) + * @param padding inner padding in points (applied uniformly on all sides) * @return this builder */ public T softPanel(DocumentColor color, DocumentCornerRadius cornerRadius, double padding) { @@ -268,10 +262,10 @@ public T softPanel(DocumentColor color) { * {@code softPanel(color, radius, padding).stroke(stroke)} — a rounded, * padded fill with a thin outline, without a separate wrapping node. * - * @param color panel fill color - * @param radius corner radius in points + * @param color panel fill color + * @param radius corner radius in points * @param padding inner padding in points (applied uniformly on all sides) - * @param stroke border stroke, or {@code null} for no border + * @param stroke border stroke, or {@code null} for no border * @return this builder * @since 1.7.0 */ @@ -285,10 +279,10 @@ public T softPanel(DocumentColor color, double radius, double padding, DocumentS * to the same node. Equivalent to * {@code softPanel(color, cornerRadius, padding).stroke(stroke)}. * - * @param color panel fill color + * @param color panel fill color * @param cornerRadius per-corner radii (see {@link DocumentCornerRadius}) - * @param padding inner padding in points (applied uniformly on all sides) - * @param stroke border stroke, or {@code null} for no border + * @param padding inner padding in points (applied uniformly on all sides) + * @param stroke border stroke, or {@code null} for no border * @return this builder * @since 1.7.0 */ @@ -378,7 +372,7 @@ public T addParagraph(String text) { /** * Adds a plain paragraph with a public canonical text style. * - * @param text paragraph text + * @param text paragraph text * @param textStyle paragraph text style * @return this builder */ @@ -412,7 +406,7 @@ public T addText(String text) { /** * Alias for {@link #addParagraph(String, DocumentTextStyle)}. * - * @param text paragraph text + * @param text paragraph text * @param textStyle paragraph text style * @return this builder */ @@ -464,8 +458,8 @@ public T addImage(Consumer spec) { * Adds an image with explicit dimensions — shortcut for the common * {@code addImage(i -> i.source(data).size(w, h))} call. * - * @param data image source bytes/path/url - * @param width image width in points + * @param data image source bytes/path/url + * @param width image width in points * @param height image height in points * @return this builder */ @@ -487,8 +481,8 @@ public T addShape(Consumer spec) { * Adds a filled shape with explicit dimensions — shortcut for the common * {@code addShape(s -> s.size(w, h).fillColor(c))} call. * - * @param width shape width in points - * @param height shape height in points + * @param width shape width in points + * @param height shape height in points * @param fillColor canonical fill color * @return this builder */ @@ -509,7 +503,7 @@ public T addSpacer(Consumer spec) { /** * Adds an invisible fixed-size spacer. * - * @param width spacer width in points + * @param width spacer width in points * @param height spacer height in points * @return this builder */ @@ -541,7 +535,7 @@ public T addEllipse(Consumer spec) { * Adds a filled circle ellipse — shortcut for * {@code addEllipse(e -> e.circle(diameter).fillColor(fillColor))}. * - * @param diameter circle diameter in points + * @param diameter circle diameter in points * @param fillColor canonical fill color * @return this builder */ @@ -553,8 +547,8 @@ public T addEllipse(double diameter, DocumentColor fillColor) { * Adds a filled ellipse with explicit width and height — shortcut for * {@code addEllipse(e -> e.size(w, h).fillColor(fillColor))}. * - * @param width ellipse width in points - * @param height ellipse height in points + * @param width ellipse width in points + * @param height ellipse height in points * @param fillColor canonical fill color * @return this builder */ @@ -576,7 +570,7 @@ public T addCircle(double diameter) { * Adds a filled circle — shortcut for * {@code addCircle(diameter, e -> e.fillColor(fillColor))}. * - * @param diameter circle diameter in points + * @param diameter circle diameter in points * @param fillColor canonical fill color * @return this builder */ @@ -588,7 +582,7 @@ public T addCircle(double diameter, DocumentColor fillColor) { * Adds a circle with equal width and height. * * @param diameter circle diameter in points - * @param spec optional additional ellipse builder callback + * @param spec optional additional ellipse builder callback * @return this builder */ public T addCircle(double diameter, Consumer spec) { @@ -623,9 +617,9 @@ public T addContainer(Consumer spec) { * .clipPolicy(ClipPolicy.OVERFLOW_VISIBLE)); * } * - * @param width canvas width in points + * @param width canvas width in points * @param height canvas height in points - * @param spec canvas builder callback + * @param spec canvas builder callback * @return this builder */ public T addCanvas(double width, double height, Consumer spec) { @@ -641,9 +635,9 @@ public T addCanvas(double width, double height, Consumer spe * section.addCircle(60, brand, c -> c.center(label)); * } * - * @param diameter circle diameter in points + * @param diameter circle diameter in points * @param fillColor canonical fill colour - * @param spec callback that appends layers + * @param spec callback that appends layers * @return this builder */ public T addCircle(double diameter, DocumentColor fillColor, Consumer spec) { @@ -657,10 +651,10 @@ public T addCircle(double diameter, DocumentColor fillColor, Consumer spec) { @@ -700,7 +694,7 @@ public T chart(ChartSpec spec) { /** * Adds a chart with an explicit style layered over the chart theme. * - * @param spec structural chart description (kind, data, axes, legend) + * @param spec structural chart description (kind, data, axes, legend) * @param style visual style overrides; {@code null} inherits the theme * @return this builder * @since 1.8.0 @@ -781,7 +775,7 @@ public T addRich(Consumer spec) { * text; the link target comes from the supplied URI.

* * @param text visible link text - * @param uri target URI + * @param uri target URI * @return this builder */ public T addLink(String text, String uri) { @@ -793,7 +787,7 @@ public T addLink(String text, String uri) { * Adds a paragraph that contains a single clickable link span configured * with explicit link options. * - * @param text visible link text + * @param text visible link text * @param options link target metadata * @return this builder */ @@ -869,7 +863,7 @@ public T headingBar(String text) { * paginate as one unit; call {@code headingBar(...)} on the page flow itself * when the body must break across pages independently of its heading.

* - * @param text the heading label text + * @param text the heading label text * @param customizer callback to tune the bar look (fill, corners, padding, * margin, text style, alignment, optional outline); may be * {@code null} for the default light-grey band @@ -919,7 +913,7 @@ public T addTimeline(Consumer spec) { * Adds a titled semantic module. * * @param title visible module title - * @param spec callback that configures module body blocks + * @param spec callback that configures module body blocks * @return this builder */ public T module(String title, Consumer spec) { @@ -940,7 +934,7 @@ public T module(Consumer spec) { * Alias for {@link #module(String, Consumer)}. * * @param title visible module title - * @param spec callback that configures module body blocks + * @param spec callback that configures module body blocks * @return this builder */ public T addModule(String title, Consumer spec) { diff --git a/src/main/java/com/demcha/compose/document/dsl/BarcodeBuilder.java b/src/main/java/com/demcha/compose/document/dsl/BarcodeBuilder.java index 94c055bf9..a0c4c46c9 100644 --- a/src/main/java/com/demcha/compose/document/dsl/BarcodeBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/BarcodeBuilder.java @@ -1,47 +1,16 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; -import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.SectionNode; -import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; +import com.demcha.compose.document.node.*; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.style.DocumentTransform; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; -import java.awt.Color; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.awt.*; import java.util.Objects; -import java.util.function.Consumer; /** * Builder for semantic barcode and QR-code nodes. + * * @since 1.0.0 */ public final class BarcodeBuilder implements Transformable { @@ -237,7 +206,7 @@ public BarcodeBuilder height(double height) { /** * Sets barcode width and height. * - * @param width width in points + * @param width width in points * @param height height in points * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/dsl/CanvasLayerBuilder.java b/src/main/java/com/demcha/compose/document/dsl/CanvasLayerBuilder.java index b07fd7275..8322368b5 100644 --- a/src/main/java/com/demcha/compose/document/dsl/CanvasLayerBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/CanvasLayerBuilder.java @@ -24,10 +24,10 @@ */ public final class CanvasLayerBuilder { + private final List placements = new ArrayList<>(); private String name = ""; private double width; private double height; - private final List placements = new ArrayList<>(); private ClipPolicy clipPolicy = ClipPolicy.CLIP_BOUNDS; private DocumentInsets padding = DocumentInsets.zero(); private DocumentInsets margin = DocumentInsets.zero(); @@ -37,7 +37,7 @@ public final class CanvasLayerBuilder { * canvas reserves a fixed {@code width × height} rectangle * regardless of where children are placed. * - * @param width canvas width in points (must be {@code > 0}) + * @param width canvas width in points (must be {@code > 0}) * @param height canvas height in points (must be {@code > 0}) */ public CanvasLayerBuilder(double width, double height) { @@ -69,7 +69,7 @@ public CanvasLayerBuilder name(String name) { * overflow if {@code width} or {@code height} shrinks past * a child's coordinate. * - * @param width canvas width in points (must be {@code > 0}) + * @param width canvas width in points (must be {@code > 0}) * @param height canvas height in points (must be {@code > 0}) * @return this builder */ @@ -91,8 +91,8 @@ public CanvasLayerBuilder size(double width, double height) { * {@code (x, y)} relative to the canvas's top-left origin. * * @param child child node to place - * @param x offset from the canvas's left edge - * @param y offset from the canvas's top edge (positive = down) + * @param x offset from the canvas's left edge + * @param y offset from the canvas's top edge (positive = down) * @return this builder */ public CanvasLayerBuilder position(DocumentNode child, double x, double y) { diff --git a/src/main/java/com/demcha/compose/document/dsl/DividerBuilder.java b/src/main/java/com/demcha/compose/document/dsl/DividerBuilder.java index 606ce8e7e..506291205 100644 --- a/src/main/java/com/demcha/compose/document/dsl/DividerBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/DividerBuilder.java @@ -1,46 +1,14 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; -import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.SectionNode; import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; -import java.awt.Color; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; +import java.awt.*; /** * Builder for thin horizontal divider nodes. + * * @since 1.0.0 */ public final class DividerBuilder extends ShapeBuilder { diff --git a/src/main/java/com/demcha/compose/document/dsl/DocumentDsl.java b/src/main/java/com/demcha/compose/document/dsl/DocumentDsl.java index bfa8be3c2..c9d1f20d5 100644 --- a/src/main/java/com/demcha/compose/document/dsl/DocumentDsl.java +++ b/src/main/java/com/demcha/compose/document/dsl/DocumentDsl.java @@ -90,9 +90,9 @@ public ParagraphBuilder paragraph() { * * @return a detached paragraph builder * @deprecated since 1.6.0; prefer {@link #paragraph()}. Carrying two - * names for the same operation on a small facade adds - * maintenance cost without clarity. Scheduled for removal in - * v2.0. + * names for the same operation on a small facade adds + * maintenance cost without clarity. Scheduled for removal in + * v2.0. */ @Deprecated(since = "1.6.0", forRemoval = true) public ParagraphBuilder text() { diff --git a/src/main/java/com/demcha/compose/document/dsl/EllipseBuilder.java b/src/main/java/com/demcha/compose/document/dsl/EllipseBuilder.java index 5b78fb0e3..af1790882 100644 --- a/src/main/java/com/demcha/compose/document/dsl/EllipseBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/EllipseBuilder.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTransform; -import java.awt.Color; +import java.awt.*; /** * Builder for semantic circle and ellipse nodes. @@ -70,7 +70,7 @@ public EllipseBuilder height(double height) { /** * Sets ellipse width and height. * - * @param width width in points + * @param width width in points * @param height height in points * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/dsl/HeadingBarStyle.java b/src/main/java/com/demcha/compose/document/dsl/HeadingBarStyle.java index 0046ed99a..5586ed87d 100644 --- a/src/main/java/com/demcha/compose/document/dsl/HeadingBarStyle.java +++ b/src/main/java/com/demcha/compose/document/dsl/HeadingBarStyle.java @@ -1,12 +1,7 @@ package com.demcha.compose.document.dsl; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.font.FontName; /** diff --git a/src/main/java/com/demcha/compose/document/dsl/ImageBuilder.java b/src/main/java/com/demcha/compose/document/dsl/ImageBuilder.java index 8fa10b75d..61ee9a51f 100644 --- a/src/main/java/com/demcha/compose/document/dsl/ImageBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/ImageBuilder.java @@ -113,7 +113,7 @@ public ImageBuilder height(double height) { /** * Sets image width and height. * - * @param width width in points + * @param width width in points * @param height height in points * @return this builder */ @@ -137,7 +137,7 @@ public ImageBuilder scale(double scale) { /** * Sets the image bounds and preserves aspect ratio by default. * - * @param width maximum drawing width in points + * @param width maximum drawing width in points * @param height maximum drawing height in points * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/dsl/LayerStackBuilder.java b/src/main/java/com/demcha/compose/document/dsl/LayerStackBuilder.java index 12273ae48..6b049d682 100644 --- a/src/main/java/com/demcha/compose/document/dsl/LayerStackBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/LayerStackBuilder.java @@ -22,8 +22,8 @@ * @since 1.0.0 */ public final class LayerStackBuilder { - private String name = ""; private final List layers = new ArrayList<>(); + private String name = ""; private DocumentInsets padding = DocumentInsets.zero(); private DocumentInsets margin = DocumentInsets.zero(); @@ -57,7 +57,7 @@ public LayerStackBuilder layer(DocumentNode node) { /** * Appends a layer with explicit alignment inside the stack box. * - * @param node child node + * @param node child node * @param align layer alignment * @return this builder */ @@ -71,8 +71,8 @@ public LayerStackBuilder layer(DocumentNode node, LayerAlign align) { * {@code zIndex} renders on top of lower {@code zIndex} regardless * of source order; the default is {@code 0}. * - * @param node child node - * @param align layer alignment + * @param node child node + * @param align layer alignment * @param zIndex render-order key * @return this builder */ @@ -87,10 +87,10 @@ public LayerStackBuilder layer(DocumentNode node, LayerAlign align, int zIndex) * offset from that anchor point. Positive {@code offsetX} moves the layer * to the right, positive {@code offsetY} moves it down. * - * @param node child node + * @param node child node * @param offsetX horizontal offset from the anchor (positive = right) * @param offsetY vertical offset from the anchor (positive = down) - * @param align anchor inside the stack box + * @param align anchor inside the stack box * @return this builder */ public LayerStackBuilder position(DocumentNode node, @@ -106,11 +106,11 @@ public LayerStackBuilder position(DocumentNode node, * Appends a layer anchored to {@code align}, nudged by an on-screen * offset, and assigned an explicit z-index. * - * @param node child node + * @param node child node * @param offsetX horizontal offset from the anchor (positive = right) * @param offsetY vertical offset from the anchor (positive = down) - * @param align anchor inside the stack box - * @param zIndex render-order key + * @param align anchor inside the stack box + * @param zIndex render-order key * @return this builder */ public LayerStackBuilder position(DocumentNode node, diff --git a/src/main/java/com/demcha/compose/document/dsl/LineBuilder.java b/src/main/java/com/demcha/compose/document/dsl/LineBuilder.java index 814966f50..054d49a78 100644 --- a/src/main/java/com/demcha/compose/document/dsl/LineBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/LineBuilder.java @@ -3,11 +3,7 @@ import com.demcha.compose.document.node.DocumentBookmarkOptions; import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.node.LineNode; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentDashPattern; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTransform; +import com.demcha.compose.document.style.*; /** * Builder for fixed-size semantic line nodes. @@ -73,7 +69,7 @@ public LineBuilder height(double height) { /** * Sets the line box width and height. * - * @param width width in points + * @param width width in points * @param height height in points * @return this builder */ @@ -118,7 +114,7 @@ public LineBuilder vertical(double height) { /** * Configures a diagonal line across the line box. * - * @param width line box width + * @param width line box width * @param height line box height * @return this builder */ @@ -330,21 +326,21 @@ public LineNode build() { private boolean isHorizontalLine() { return startX != null - && endX != null - && startY != null - && endY != null - && Double.compare(startX, 0.0) == 0 - && Double.compare(endX, width) == 0 - && Double.compare(startY, endY) == 0; + && endX != null + && startY != null + && endY != null + && Double.compare(startX, 0.0) == 0 + && Double.compare(endX, width) == 0 + && Double.compare(startY, endY) == 0; } private boolean isVerticalLine() { return startX != null - && endX != null - && startY != null - && endY != null - && Double.compare(startY, 0.0) == 0 - && Double.compare(endY, height) == 0 - && Double.compare(startX, endX) == 0; + && endX != null + && startY != null + && endY != null + && Double.compare(startY, 0.0) == 0 + && Double.compare(endY, height) == 0 + && Double.compare(startX, endX) == 0; } } diff --git a/src/main/java/com/demcha/compose/document/dsl/ListBuilder.java b/src/main/java/com/demcha/compose/document/dsl/ListBuilder.java index 2ed965c11..eef60e9f2 100644 --- a/src/main/java/com/demcha/compose/document/dsl/ListBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/ListBuilder.java @@ -1,53 +1,24 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; -import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; import com.demcha.compose.document.node.ListItem; import com.demcha.compose.document.node.ListMarker; import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.SectionNode; -import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; -import java.awt.Color; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Consumer; /** * Builder for semantic list nodes with marker and spacing controls. + * * @since 1.0.0 */ public final class ListBuilder { - private String name = ""; private final List items = new ArrayList<>(); private final Map markerOverrides = new LinkedHashMap<>(); + private String name = ""; private boolean usedNestedAuthoring = false; private ListMarker marker = ListMarker.bullet(); private DocumentTextStyle textStyle = DocumentTextStyle.DEFAULT; @@ -65,6 +36,23 @@ public final class ListBuilder { public ListBuilder() { } + private static List applyMarkerOverrides(List items, + int depth, + Map overrides) { + if (items.isEmpty()) { + return List.of(); + } + List out = new ArrayList<>(items.size()); + for (ListItem item : items) { + ListMarker effective = item.marker() != null + ? item.marker() + : overrides.get(depth); + List resolvedChildren = applyMarkerOverrides(item.children(), depth + 1, overrides); + out.add(new ListItem(item.label(), effective, resolvedChildren)); + } + return List.copyOf(out); + } + /** * Sets the list node name. * @@ -134,7 +122,7 @@ public ListBuilder addItem(String item) { * leaves alongside the nested entries.

* * @param label visible label for this item - * @param body callback that adds children of this item + * @param body callback that adds children of this item * @return this builder */ public ListBuilder addItem(String label, Consumer body) { @@ -157,7 +145,7 @@ public ListBuilder addItem(String label, Consumer body) { * This setter wins over the cascade but is overridden by an * explicit per-item marker.

* - * @param depth zero-based depth (0 = top-level) + * @param depth zero-based depth (0 = top-level) * @param marker marker to render at that depth, or {@code null} to clear an override * @return this builder * @throws IllegalArgumentException when {@code depth} is negative @@ -303,10 +291,10 @@ public ListBuilder padding(DocumentInsets padding) { /** * Sets list padding from explicit side values. * - * @param top top padding - * @param right right padding + * @param top top padding + * @param right right padding * @param bottom bottom padding - * @param left left padding + * @param left left padding * @return this builder */ public ListBuilder padding(float top, float right, float bottom, float left) { @@ -327,10 +315,10 @@ public ListBuilder margin(DocumentInsets margin) { /** * Sets list margin from explicit side values. * - * @param top top margin - * @param right right margin + * @param top top margin + * @param right right margin * @param bottom bottom margin - * @param left left margin + * @param left left margin * @return this builder */ public ListBuilder margin(float top, float right, float bottom, float left) { @@ -392,23 +380,6 @@ public ListNode build() { margin); } - private static List applyMarkerOverrides(List items, - int depth, - Map overrides) { - if (items.isEmpty()) { - return List.of(); - } - List out = new ArrayList<>(items.size()); - for (ListItem item : items) { - ListMarker effective = item.marker() != null - ? item.marker() - : overrides.get(depth); - List resolvedChildren = applyMarkerOverrides(item.children(), depth + 1, overrides); - out.add(new ListItem(item.label(), effective, resolvedChildren)); - } - return List.copyOf(out); - } - /** * Snapshots the items collected on this builder for use as a * child sub-tree in a parent {@link #addItem(String, Consumer)} diff --git a/src/main/java/com/demcha/compose/document/dsl/ModuleBuilder.java b/src/main/java/com/demcha/compose/document/dsl/ModuleBuilder.java index 59c970c2f..032566ed5 100644 --- a/src/main/java/com/demcha/compose/document/dsl/ModuleBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/ModuleBuilder.java @@ -1,42 +1,12 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.SectionNode; -import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; +import com.demcha.compose.document.node.*; import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; -import java.awt.Color; -import java.nio.file.Path; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import java.util.Objects; import java.util.function.Consumer; /** @@ -52,6 +22,7 @@ public final class ModuleBuilder extends AbstractFlowBuilder items, Consumer spec) { @@ -253,7 +224,7 @@ public ModuleBuilder table(Consumer spec) { * Appends a simple table with auto-width columns. * * @param headers header row values - * @param rows data rows + * @param rows data rows * @return this builder */ public ModuleBuilder table(List headers, List> rows) { @@ -320,8 +291,6 @@ public ModuleBuilder custom(DocumentNode node) { return add(node); } - private boolean keepTogether = false; - /** * Keeps the whole module (title plus body) on one page: when it does not fit * in the remaining page space but fits on a fresh page, it relocates whole to diff --git a/src/main/java/com/demcha/compose/document/dsl/PageBreakBuilder.java b/src/main/java/com/demcha/compose/document/dsl/PageBreakBuilder.java index 4c5eda59c..3106c86a3 100644 --- a/src/main/java/com/demcha/compose/document/dsl/PageBreakBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/PageBreakBuilder.java @@ -1,46 +1,11 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; -import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.SectionNode; -import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; - -import java.awt.Color; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; /** * Builder for explicit page-break control nodes. + * * @since 1.0.0 */ public final class PageBreakBuilder { diff --git a/src/main/java/com/demcha/compose/document/dsl/PageFlowBuilder.java b/src/main/java/com/demcha/compose/document/dsl/PageFlowBuilder.java index 8e030180b..9f860498c 100644 --- a/src/main/java/com/demcha/compose/document/dsl/PageFlowBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/PageFlowBuilder.java @@ -1,43 +1,7 @@ package com.demcha.compose.document.dsl; import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; -import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.SectionNode; -import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; - -import java.awt.Color; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; /** * Builder for root page-flow containers that attach to a document session. diff --git a/src/main/java/com/demcha/compose/document/dsl/ParagraphBuilder.java b/src/main/java/com/demcha/compose/document/dsl/ParagraphBuilder.java index c86f92f24..b279ef8e8 100644 --- a/src/main/java/com/demcha/compose/document/dsl/ParagraphBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/ParagraphBuilder.java @@ -698,6 +698,3 @@ public ParagraphNode build() { } } -/** - * Builder for simple semantic lists. - */ diff --git a/src/main/java/com/demcha/compose/document/dsl/RichText.java b/src/main/java/com/demcha/compose/document/dsl/RichText.java index c17df8516..a555f1d18 100644 --- a/src/main/java/com/demcha/compose/document/dsl/RichText.java +++ b/src/main/java/com/demcha/compose/document/dsl/RichText.java @@ -1,19 +1,10 @@ package com.demcha.compose.document.dsl; import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.InlineImageAlignment; -import com.demcha.compose.document.node.InlineShapeRun; -import com.demcha.compose.document.node.InlineImageRun; -import com.demcha.compose.document.node.InlineRun; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.style.ShapeOutline; - -import java.awt.Color; +import com.demcha.compose.document.node.*; +import com.demcha.compose.document.style.*; + +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -129,7 +120,7 @@ public RichText strikethrough(String text) { /** * Appends a colored text run with the default decoration. * - * @param text text fragment + * @param text text fragment * @param color text color * @return this builder */ @@ -140,7 +131,7 @@ public RichText color(String text, DocumentColor color) { /** * Convenience overload accepting a {@link Color}. * - * @param text text fragment + * @param text text fragment * @param color text color * @return this builder */ @@ -152,7 +143,7 @@ public RichText color(String text, Color color) { * Appends a bold-and-colored "accent" text run — the typical pattern for * highlighting status keywords ("Pending", "Paid", "Overdue") inline. * - * @param text text fragment + * @param text text fragment * @param color accent color * @return this builder */ @@ -167,7 +158,7 @@ public RichText accent(String text, DocumentColor color) { * Convenience overload of {@link #accent(String, DocumentColor)} accepting a * {@link Color}. * - * @param text text fragment + * @param text text fragment * @param color accent color * @return this builder */ @@ -190,7 +181,7 @@ public RichText size(String text, double size) { /** * Appends a fully-styled text run. * - * @param text text fragment + * @param text text fragment * @param style explicit style for this run; when {@code null}, falls back * to the paragraph default * @return this builder @@ -202,7 +193,7 @@ public RichText style(String text, DocumentTextStyle style) { /** * Appends a clickable link run with default link styling. * - * @param text visible link text + * @param text visible link text * @param options link metadata * @return this builder */ @@ -214,7 +205,7 @@ public RichText link(String text, DocumentLinkOptions options) { * Convenience link overload using a raw URI string. * * @param text visible link text - * @param uri link target URI + * @param uri link target URI * @return this builder */ public RichText link(String text, String uri) { @@ -225,9 +216,9 @@ public RichText link(String text, String uri) { * Appends a fully-customized run with both an explicit style and link * metadata. * - * @param text text fragment + * @param text text fragment * @param style explicit style or {@code null} - * @param link link metadata or {@code null} + * @param link link metadata or {@code null} * @return this builder */ public RichText with(String text, DocumentTextStyle style, DocumentLinkOptions link) { @@ -260,8 +251,8 @@ public RichText append(RichText other) { * alignment and zero offset. * * @param imageData image payload - * @param width target width in points - * @param height target height in points + * @param width target width in points + * @param height target height in points * @return this builder */ public RichText image(DocumentImageData imageData, double width, double height) { @@ -272,8 +263,8 @@ public RichText image(DocumentImageData imageData, double width, double height) * Appends an inline image run with explicit vertical alignment. * * @param imageData image payload - * @param width target width in points - * @param height target height in points + * @param width target width in points + * @param height target height in points * @param alignment vertical alignment relative to surrounding text * @return this builder */ @@ -288,12 +279,12 @@ public RichText image(DocumentImageData imageData, * Appends a clickable inline image run; the link annotation covers the * image rectangle on supporting backends. * - * @param imageData image payload - * @param width target width in points - * @param height target height in points - * @param alignment vertical alignment relative to surrounding text + * @param imageData image payload + * @param width target width in points + * @param height target height in points + * @param alignment vertical alignment relative to surrounding text * @param baselineOffset extra vertical shift in points; positive moves up - * @param linkOptions optional link metadata + * @param linkOptions optional link metadata * @return this builder */ public RichText image(DocumentImageData imageData, @@ -318,7 +309,7 @@ public RichText image(DocumentImageData imageData, * should not depend on font glyph coverage. * * @param diameter circle diameter in points - * @param fill fill color + * @param fill fill color * @return this builder */ public RichText dot(double diameter, DocumentColor fill) { @@ -330,8 +321,8 @@ public RichText dot(double diameter, DocumentColor fill) { * — for example a filled dot ({@code ●}) or an outlined one ({@code ○}). * * @param diameter circle diameter in points - * @param fill optional fill color - * @param stroke optional outline stroke + * @param fill optional fill color + * @param stroke optional outline stroke * @return this builder */ public RichText dot(double diameter, DocumentColor fill, DocumentStroke stroke) { @@ -342,9 +333,9 @@ public RichText dot(double diameter, DocumentColor fill, DocumentStroke stroke) * Appends an inline ellipse run with default * {@link InlineImageAlignment#CENTER} alignment and zero offset. * - * @param width target width in points + * @param width target width in points * @param height target height in points - * @param fill optional fill color + * @param fill optional fill color * @param stroke optional outline stroke * @return this builder */ @@ -389,9 +380,9 @@ public RichText star(double size, DocumentColor fill) { * Appends an inline block arrow sized {@code size × size} pointing in * {@code direction} — a directional marker between text or a list bullet. * - * @param size figure width and height in points + * @param size figure width and height in points * @param direction the way the arrow points - * @param fill fill color + * @param fill fill color * @return this builder */ public RichText arrow(double size, ShapeOutline.Direction direction, DocumentColor fill) { @@ -403,10 +394,10 @@ public RichText arrow(double size, ShapeOutline.Direction direction, DocumentCol * swappable-design overload, so a caller (or a future "pick your arrow" UI) * can choose a block arrow, a triangular arrowhead, etc. * - * @param size figure width and height in points + * @param size figure width and height in points * @param direction the way the arrow points - * @param style the arrow design - * @param fill fill color + * @param style the arrow design + * @param fill fill color * @return this builder * @since 1.7.0 */ @@ -422,9 +413,9 @@ public RichText arrow(double size, * Appends an inline chevron sized {@code size × size} pointing in * {@code direction} — a lighter directional separator for step lists. * - * @param size figure width and height in points + * @param size figure width and height in points * @param direction the way the chevron points - * @param fill fill color + * @param fill fill color * @return this builder */ public RichText chevron(double size, ShapeOutline.Direction direction, DocumentColor fill) { @@ -437,7 +428,7 @@ public RichText chevron(double size, ShapeOutline.Direction direction, DocumentC * offset. * * @param outline figure geometry; supplies the run's size - * @param fill fill color + * @param fill fill color * @return this builder */ public RichText shape(ShapeOutline outline, DocumentColor fill) { @@ -448,12 +439,12 @@ public RichText shape(ShapeOutline outline, DocumentColor fill) { * Appends a fully-specified inline shape run of any {@link ShapeOutline} * kind. At least one of {@code fill} or {@code stroke} must be present. * - * @param outline figure geometry; supplies the run's size - * @param fill optional fill color - * @param stroke optional outline stroke - * @param alignment vertical alignment relative to surrounding text + * @param outline figure geometry; supplies the run's size + * @param fill optional fill color + * @param stroke optional outline stroke + * @param alignment vertical alignment relative to surrounding text * @param baselineOffset extra vertical shift in points; positive moves up - * @param linkOptions optional inline link metadata + * @param linkOptions optional inline link metadata * @return this builder */ public RichText shape(ShapeOutline outline, @@ -481,9 +472,9 @@ public RichText shape(ShapeOutline outline, * * 
{@code rich.plain("Revenue ").sparkline(36, 9, accent, 65.2, 69.8, 74.1, 81.3, 88.2)}
* - * @param width sparkline width in points + * @param width sparkline width in points * @param height sparkline height in points - * @param fill silhouette fill colour + * @param fill silhouette fill colour * @param values data run, at least two finite values * @return this builder * @since 1.8.0 @@ -497,11 +488,11 @@ public RichText sparkline(double width, double height, DocumentColor fill, doubl * Appends an inline line sparkline — the value run as a * constant-thickness stroked-looking band, without the filled area. * - * @param width sparkline width in points - * @param height sparkline height in points + * @param width sparkline width in points + * @param height sparkline height in points * @param thickness line thickness in points (must be smaller than {@code height}) - * @param color line colour - * @param values data run, at least two finite values + * @param color line colour + * @param values data run, at least two finite values * @return this builder * @since 1.8.0 */ @@ -520,9 +511,9 @@ public RichText sparklineLine(double width, double height, double thickness, * centred checkmark inside (the checked state), each in its own colour — * for todo / checklist markers between text. * - * @param size box width and height in points - * @param checked whether the checkmark is shown - * @param boxColor frame stroke color + * @param size box width and height in points + * @param checked whether the checkmark is shown + * @param boxColor frame stroke color * @param checkColor checkmark fill color * @return this builder */ @@ -535,9 +526,9 @@ public RichText checkbox(double size, boolean checked, DocumentColor boxColor, D * Appends an inline checkbox using one colour for both the frame and the * checkmark. * - * @param size box width and height in points + * @param size box width and height in points * @param checked whether the checkmark is shown - * @param color frame and checkmark color + * @param color frame and checkmark color * @return this builder */ public RichText checkbox(double size, boolean checked, DocumentColor color) { @@ -548,10 +539,10 @@ public RichText checkbox(double size, boolean checked, DocumentColor color) { * Appends an inline checkbox whose checked-state tick uses the given * {@link ShapeOutline.CheckmarkStyle} — the "pick your tick" overload. * - * @param size box width and height in points - * @param checked whether the checkmark is shown - * @param markStyle design of the checked-state tick - * @param boxColor frame stroke color + * @param size box width and height in points + * @param checked whether the checkmark is shown + * @param markStyle design of the checked-state tick + * @param boxColor frame stroke color * @param checkColor checkmark fill color * @return this builder * @since 1.7.0 @@ -570,11 +561,11 @@ public RichText checkbox(double size, * {@link ShapeOutline} — the power-user overload. Size the mark to fit the * frame (≈ {@code 0.6 × size}); it is drawn centred in the box. * - * @param size box width and height in points - * @param checked whether the mark is shown - * @param mark checked-state mark geometry, already sized; must be non-null - * when {@code checked} is {@code true} - * @param boxColor frame stroke color + * @param size box width and height in points + * @param checked whether the mark is shown + * @param mark checked-state mark geometry, already sized; must be non-null + * when {@code checked} is {@code true} + * @param boxColor frame stroke color * @param checkColor mark fill color * @return this builder * @since 1.7.0 diff --git a/src/main/java/com/demcha/compose/document/dsl/RowBuilder.java b/src/main/java/com/demcha/compose/document/dsl/RowBuilder.java index 03a0c6999..b4a193617 100644 --- a/src/main/java/com/demcha/compose/document/dsl/RowBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/RowBuilder.java @@ -2,25 +2,8 @@ import com.demcha.compose.document.dsl.internal.BuilderSupport; import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.EllipseNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.LayerStackNode; -import com.demcha.compose.document.node.LineNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.RowNode; -import com.demcha.compose.document.node.SectionNode; -import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.SpacerNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.style.DocumentBorders; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.node.*; +import com.demcha.compose.document.style.*; import java.nio.file.Path; import java.util.ArrayList; @@ -47,9 +30,9 @@ * @since 1.0.0 */ public final class RowBuilder { - private String name = ""; private final List children = new ArrayList<>(); private final List weights = new ArrayList<>(); + private String name = ""; private boolean weightsDirty; private double gap; private DocumentInsets padding = DocumentInsets.zero(); @@ -65,6 +48,23 @@ public final class RowBuilder { public RowBuilder() { } + private static boolean isAllowedRowChild(DocumentNode child) { + return child instanceof ParagraphNode + || child instanceof ImageNode + || child instanceof ShapeNode + || child instanceof LineNode + || child instanceof EllipseNode + || child instanceof SpacerNode + || child instanceof BarcodeNode + || child instanceof SectionNode + || child instanceof ContainerNode + // LayerStackNode is an atomic overlay composite: its layers + // share the same bounding box and do not compete with the + // parent row's horizontal band, so it is safe to drop into a + // row slot just like a section column. + || child instanceof LayerStackNode; + } + /** * Sets the semantic row name. * @@ -94,7 +94,7 @@ public RowBuilder spacing(double spacing) { * @param gap gap in points * @return this builder * @deprecated since 1.5.0, use {@link #spacing(double)} instead — vertical - * flows and rows now share the same {@code spacing(...)} verb. + * flows and rows now share the same {@code spacing(...)} verb. */ @Deprecated(since = "1.5.0") public RowBuilder gap(double gap) { @@ -208,9 +208,9 @@ public RowBuilder evenWeights() { * * @param node atomic semantic node * @return this builder - * @throws NullPointerException if {@code node} is null + * @throws NullPointerException if {@code node} is null * @throws IllegalArgumentException if {@code node} is a {@link RowNode}, - * a {@link TableNode}, or any other type the row layout cannot host + * a {@link TableNode}, or any other type the row layout cannot host */ public RowBuilder add(DocumentNode node) { if (node == null) { @@ -218,15 +218,15 @@ public RowBuilder add(DocumentNode node) { } if (node instanceof RowNode) { throw new IllegalArgumentException("Row '" + name - + "' cannot contain another row; use a section as a column instead."); + + "' cannot contain another row; use a section as a column instead."); } if (node instanceof TableNode) { throw new IllegalArgumentException("Row '" + name - + "' cannot contain a table; tables are splittable and would conflict with the row's atomic pagination."); + + "' cannot contain a table; tables are splittable and would conflict with the row's atomic pagination."); } if (!isAllowedRowChild(node)) { throw new IllegalArgumentException("Row '" + name + "' does not support child node type '" - + node.getClass().getSimpleName() + "'."); + + node.getClass().getSimpleName() + "'."); } this.children.add(node); return this; @@ -255,7 +255,7 @@ public RowBuilder addParagraph(String text) { /** * Adds a paragraph child with the supplied text style. * - * @param text paragraph text content + * @param text paragraph text content * @param textStyle resolved text style * @return this builder */ @@ -410,25 +410,8 @@ public RowNode build() { private void validate() { if (weightsDirty && !weights.isEmpty() && weights.size() != children.size()) { throw new IllegalStateException("RowBuilder weights size " + weights.size() - + " does not match children size " + children.size() - + ". Pass " + children.size() + " weights or call evenWeights()."); + + " does not match children size " + children.size() + + ". Pass " + children.size() + " weights or call evenWeights()."); } } - - private static boolean isAllowedRowChild(DocumentNode child) { - return child instanceof ParagraphNode - || child instanceof ImageNode - || child instanceof ShapeNode - || child instanceof LineNode - || child instanceof EllipseNode - || child instanceof SpacerNode - || child instanceof BarcodeNode - || child instanceof SectionNode - || child instanceof ContainerNode - // LayerStackNode is an atomic overlay composite: its layers - // share the same bounding box and do not compete with the - // parent row's horizontal band, so it is safe to drop into a - // row slot just like a section column. - || child instanceof LayerStackNode; - } } diff --git a/src/main/java/com/demcha/compose/document/dsl/SectionBuilder.java b/src/main/java/com/demcha/compose/document/dsl/SectionBuilder.java index f31fa26c5..d4518928a 100644 --- a/src/main/java/com/demcha/compose/document/dsl/SectionBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/SectionBuilder.java @@ -1,43 +1,6 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; -import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; import com.demcha.compose.document.node.SectionNode; -import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; - -import java.awt.Color; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; /** * Builder for semantic sections inside document flows. diff --git a/src/main/java/com/demcha/compose/document/dsl/ShapeBuilder.java b/src/main/java/com/demcha/compose/document/dsl/ShapeBuilder.java index 03a8ae2f7..21821a47d 100644 --- a/src/main/java/com/demcha/compose/document/dsl/ShapeBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/ShapeBuilder.java @@ -1,45 +1,11 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.internal.BuilderSupport; -import com.demcha.compose.document.dsl.internal.SemanticNameNormalizer; -import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.BarcodeNode; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; import com.demcha.compose.document.node.DocumentBookmarkOptions; import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.PageBreakNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.SectionNode; import com.demcha.compose.document.node.ShapeNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.style.DocumentTransform; -import com.demcha.compose.document.table.DocumentTableCell; -import com.demcha.compose.document.table.DocumentTableColumn; -import com.demcha.compose.document.table.DocumentTableStyle; +import com.demcha.compose.document.style.*; -import java.awt.Color; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; +import java.awt.*; /** * Builder for rectangle-like semantic shape nodes. @@ -103,7 +69,7 @@ public ShapeBuilder height(double height) { /** * Sets shape width and height. * - * @param width width in points + * @param width width in points * @param height height in points * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/dsl/ShapeContainerBuilder.java b/src/main/java/com/demcha/compose/document/dsl/ShapeContainerBuilder.java index 34b0dc5e6..b1c28c50f 100644 --- a/src/main/java/com/demcha/compose/document/dsl/ShapeContainerBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/ShapeContainerBuilder.java @@ -4,15 +4,9 @@ import com.demcha.compose.document.node.LayerAlign; import com.demcha.compose.document.node.LayerStackNode; import com.demcha.compose.document.node.ShapeContainerNode; -import com.demcha.compose.document.style.ClipPolicy; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTransform; -import com.demcha.compose.document.style.ShapeOutline; - -import java.awt.Color; +import com.demcha.compose.document.style.*; + +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -31,9 +25,9 @@ * @since 1.0.0 */ public final class ShapeContainerBuilder implements Transformable { + private final List layers = new ArrayList<>(); private String name = ""; private ShapeOutline outline; - private final List layers = new ArrayList<>(); // Default to CLIP_PATH per ADR §Decision — see ShapeContainerNode for // the rationale. private ClipPolicy clipPolicy = ClipPolicy.CLIP_PATH; @@ -63,7 +57,7 @@ public ShapeContainerBuilder name(String name) { /** * Sets a plain rectangle outline. * - * @param width outline width in points + * @param width outline width in points * @param height outline height in points * @return this builder */ @@ -75,8 +69,8 @@ public ShapeContainerBuilder rectangle(double width, double height) { /** * Sets a rounded-rectangle outline. * - * @param width outline width in points - * @param height outline height in points + * @param width outline width in points + * @param height outline height in points * @param cornerRadius corner radius in points * @return this builder */ @@ -90,8 +84,8 @@ public ShapeContainerBuilder roundedRect(double width, double height, double cor * it to round only one side of a container (e.g. * {@link DocumentCornerRadius#right(double)}) without a CLIP_PATH parent. * - * @param width outline width in points - * @param height outline height in points + * @param width outline width in points + * @param height outline height in points * @param cornerRadius per-corner radii * @return this builder * @since 1.7.0 @@ -104,7 +98,7 @@ public ShapeContainerBuilder roundedRect(double width, double height, DocumentCo /** * Sets an ellipse outline. * - * @param width outline width in points + * @param width outline width in points * @param height outline height in points * @return this builder */ @@ -127,7 +121,7 @@ public ShapeContainerBuilder circle(double diameter) { /** * Sets a diamond (rhombus) outline. * - * @param width outline width in points + * @param width outline width in points * @param height outline height in points * @return this builder */ @@ -139,7 +133,7 @@ public ShapeContainerBuilder diamond(double width, double height) { /** * Sets an upward-pointing triangle outline. * - * @param width outline width in points + * @param width outline width in points * @param height outline height in points * @return this builder */ @@ -151,7 +145,7 @@ public ShapeContainerBuilder triangle(double width, double height) { /** * Sets a five-pointed star outline. * - * @param width outline width in points + * @param width outline width in points * @param height outline height in points * @return this builder */ @@ -163,7 +157,7 @@ public ShapeContainerBuilder star(double width, double height) { /** * Sets an {@code n}-pointed star outline. * - * @param width outline width in points + * @param width outline width in points * @param height outline height in points * @param points number of outer points (at least 2) * @return this builder @@ -176,8 +170,8 @@ public ShapeContainerBuilder star(double width, double height, int points) { /** * Sets a block arrow outline pointing in {@code direction}. * - * @param width outline width in points - * @param height outline height in points + * @param width outline width in points + * @param height outline height in points * @param direction the way the arrow points * @return this builder */ @@ -189,8 +183,8 @@ public ShapeContainerBuilder arrow(double width, double height, ShapeOutline.Dir /** * Sets a chevron outline pointing in {@code direction}. * - * @param width outline width in points - * @param height outline height in points + * @param width outline width in points + * @param height outline height in points * @param direction the way the chevron points * @return this builder */ @@ -321,7 +315,7 @@ public DocumentTransform currentTransform() { /** * Appends a layer with explicit alignment. * - * @param node child node + * @param node child node * @param align anchor inside the inner box * @return this builder */ @@ -335,8 +329,8 @@ public ShapeContainerBuilder layer(DocumentNode node, LayerAlign align) { * {@code zIndex} renders on top of lower {@code zIndex} regardless * of source order; the default is {@code 0}. * - * @param node child node - * @param align anchor inside the inner box + * @param node child node + * @param align anchor inside the inner box * @param zIndex render-order key * @return this builder */ @@ -360,10 +354,10 @@ public ShapeContainerBuilder layer(DocumentNode node) { * Appends a layer anchored to {@code align} and shifted by an on-screen * offset (positive {@code offsetX} = right, positive {@code offsetY} = down). * - * @param node child node + * @param node child node * @param offsetX horizontal offset in points * @param offsetY vertical offset in points - * @param align anchor inside the inner box + * @param align anchor inside the inner box * @return this builder */ public ShapeContainerBuilder position(DocumentNode node, @@ -379,11 +373,11 @@ public ShapeContainerBuilder position(DocumentNode node, * Appends a layer anchored to {@code align}, shifted by an on-screen * offset, and assigned an explicit z-index. * - * @param node child node + * @param node child node * @param offsetX horizontal offset in points * @param offsetY vertical offset in points - * @param align anchor inside the inner box - * @param zIndex render-order key + * @param align anchor inside the inner box + * @param zIndex render-order key * @return this builder */ public ShapeContainerBuilder position(DocumentNode node, @@ -510,7 +504,7 @@ public ShapeContainerNode build() { if (outline == null) { throw new IllegalStateException( "ShapeContainerBuilder '" + name + "' requires an outline; " - + "call rectangle/roundedRect/ellipse/circle before build()."); + + "call rectangle/roundedRect/ellipse/circle before build()."); } return new ShapeContainerNode(name, outline, layers, clipPolicy, fillColor, stroke, padding, margin, transform); } diff --git a/src/main/java/com/demcha/compose/document/dsl/SpacerBuilder.java b/src/main/java/com/demcha/compose/document/dsl/SpacerBuilder.java index 5b72ea480..9dd95c305 100644 --- a/src/main/java/com/demcha/compose/document/dsl/SpacerBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/SpacerBuilder.java @@ -58,7 +58,7 @@ public SpacerBuilder height(double height) { /** * Sets spacer width and height. * - * @param width width in points + * @param width width in points * @param height height in points * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/dsl/SparklineGeometry.java b/src/main/java/com/demcha/compose/document/dsl/SparklineGeometry.java index 12c08287d..a5490475c 100644 --- a/src/main/java/com/demcha/compose/document/dsl/SparklineGeometry.java +++ b/src/main/java/com/demcha/compose/document/dsl/SparklineGeometry.java @@ -46,7 +46,7 @@ static List areaPoints(double[] values) { * offset is vertical (not perpendicular), which is visually equivalent at * sparkline sizes and keeps the maths exact. * - * @param values at least two finite values + * @param values at least two finite values * @param thicknessFraction band thickness as a fraction of the box height, in (0, 1) * @return closed ring of {@code 2n} normalized vertices */ diff --git a/src/main/java/com/demcha/compose/document/dsl/TableBuilder.java b/src/main/java/com/demcha/compose/document/dsl/TableBuilder.java index dc2922106..07e09c3fa 100644 --- a/src/main/java/com/demcha/compose/document/dsl/TableBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/TableBuilder.java @@ -1,37 +1,29 @@ package com.demcha.compose.document.dsl; -import com.demcha.compose.document.dsl.internal.BuilderSupport; import com.demcha.compose.document.node.DocumentBookmarkOptions; import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.table.DocumentTableCell; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; +import java.util.*; /** * Builder for semantic table nodes. + * * @since 1.0.0 */ public final class TableBuilder { - private String name = ""; private final List columns = new ArrayList<>(); private final List> rows = new ArrayList<>(); private final Map rowStyles = new LinkedHashMap<>(); private final Map columnStyles = new LinkedHashMap<>(); + private String name = ""; private DocumentTableStyle defaultCellStyle = DocumentTableStyle.empty(); private Double width; private DocumentLinkOptions linkOptions; @@ -54,6 +46,15 @@ public final class TableBuilder { public TableBuilder() { } + private static DocumentTableStyle defaultTotalRowStyle() { + return DocumentTableStyle.builder() + .textStyle(DocumentTextStyle.builder() + .decoration(DocumentTextDecoration.BOLD) + .build()) + .fillColor(DocumentColor.rgb(240, 240, 245)) + .build(); + } + /** * Sets the table node name. * @@ -181,8 +182,8 @@ public TableBuilder headerRow(String... values) { * row alternation because the row's index is added to {@code rowStyles} * directly. * - * @param style totals-row style override (typically bold + a subtle - * fill to separate the totals from the data rows) + * @param style totals-row style override (typically bold + a subtle + * fill to separate the totals from the data rows) * @param values totals cell text values * @return this builder */ @@ -206,15 +207,6 @@ public TableBuilder totalRow(String... values) { return totalRow(defaultTotalRowStyle(), values); } - private static DocumentTableStyle defaultTotalRowStyle() { - return DocumentTableStyle.builder() - .textStyle(DocumentTextStyle.builder() - .decoration(DocumentTextDecoration.BOLD) - .build()) - .fillColor(DocumentColor.rgb(240, 240, 245)) - .build(); - } - /** * Configures alternating row fill colours. The {@code odd} style is * applied to rows at index 0, 2, 4 (visually first, third, fifth); @@ -228,8 +220,8 @@ private static DocumentTableStyle defaultTotalRowStyle() { * {@link #headerStyle(DocumentTableStyle)} or * {@link #totalRow(String...)} take precedence.

* - * @param odd style for odd-indexed rows (index 0, 2, 4 — first, - * third, fifth visually) + * @param odd style for odd-indexed rows (index 0, 2, 4 — first, + * third, fifth visually) * @param even style for even-indexed rows (index 1, 3, 5) * @return this builder */ @@ -244,7 +236,7 @@ public TableBuilder zebra(DocumentTableStyle odd, DocumentTableStyle even) { * skipping any other styling. Either colour may be {@code null} to * leave that parity unstyled. * - * @param odd fill colour for odd-indexed rows (1st, 3rd, 5th) + * @param odd fill colour for odd-indexed rows (1st, 3rd, 5th) * @param even fill colour for even-indexed rows (2nd, 4th, 6th) * @return this builder */ @@ -345,7 +337,7 @@ public TableBuilder headerStyle(DocumentTableStyle style) { * Applies a public canonical style override to a row. * * @param rowIndex zero-based row index - * @param style row style override + * @param style row style override * @return this builder */ public TableBuilder rowStyle(int rowIndex, DocumentTableStyle style) { @@ -360,7 +352,7 @@ public TableBuilder rowStyle(int rowIndex, DocumentTableStyle style) { * Applies a public canonical style override to a column. * * @param columnIndex zero-based column index - * @param style column style override + * @param style column style override * @return this builder */ public TableBuilder columnStyle(int columnIndex, DocumentTableStyle style) { diff --git a/src/main/java/com/demcha/compose/document/dsl/TimelineBuilder.java b/src/main/java/com/demcha/compose/document/dsl/TimelineBuilder.java index 989f9bc5a..39d9d2a0a 100644 --- a/src/main/java/com/demcha/compose/document/dsl/TimelineBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/TimelineBuilder.java @@ -44,7 +44,7 @@ public final class TimelineBuilder { private static final DocumentColor DEFAULT_RAIL = DocumentColor.rgb(150, 158, 172); private static final DocumentColor DEFAULT_INK = DocumentColor.rgb(34, 38, 50); private static final DocumentColor DEFAULT_MUTED = DocumentColor.rgb(120, 124, 136); - + private final List entries = new ArrayList<>(); private DocumentColor connectorColor = DEFAULT_RAIL; private double connectorWidth = 1.5; private double gutter = 8.0; @@ -57,11 +57,38 @@ public final class TimelineBuilder { private boolean keepTogether = false; private boolean keepEntriesTogether = false; - private final List entries = new ArrayList<>(); - TimelineBuilder() { } + private static boolean notBlank(String value) { + return value != null && !value.isBlank(); + } + + private static DocumentTextStyle defaultTitleStyle() { + return DocumentTextStyle.builder() + .fontName(FontName.HELVETICA_BOLD) + .decoration(DocumentTextDecoration.BOLD) + .size(11) + .color(DEFAULT_INK) + .build(); + } + + private static DocumentTextStyle defaultMetaStyle() { + return DocumentTextStyle.builder() + .fontName(FontName.HELVETICA) + .size(8.5) + .color(DEFAULT_MUTED) + .build(); + } + + private static DocumentTextStyle defaultBodyStyle() { + return DocumentTextStyle.builder() + .fontName(FontName.HELVETICA) + .size(9.5) + .color(DEFAULT_INK) + .build(); + } + /** * Sets the connector rail colour and width. * @@ -168,7 +195,7 @@ public TimelineBuilder bodyStyle(DocumentTextStyle style) { /** * Adds one timeline entry — a marker paired with its content. * - * @param marker the marker drawn in the rail for this entry + * @param marker the marker drawn in the rail for this entry * @param content callback configuring the entry's title, meta and body * @return this builder * @throws NullPointerException if {@code marker} is {@code null} @@ -267,35 +294,6 @@ void buildInto(SectionBuilder timeline) { } } - private static boolean notBlank(String value) { - return value != null && !value.isBlank(); - } - - private static DocumentTextStyle defaultTitleStyle() { - return DocumentTextStyle.builder() - .fontName(FontName.HELVETICA_BOLD) - .decoration(DocumentTextDecoration.BOLD) - .size(11) - .color(DEFAULT_INK) - .build(); - } - - private static DocumentTextStyle defaultMetaStyle() { - return DocumentTextStyle.builder() - .fontName(FontName.HELVETICA) - .size(8.5) - .color(DEFAULT_MUTED) - .build(); - } - - private static DocumentTextStyle defaultBodyStyle() { - return DocumentTextStyle.builder() - .fontName(FontName.HELVETICA) - .size(9.5) - .color(DEFAULT_INK) - .build(); - } - private record Entry(TimelineMarker marker, TimelineEntryBuilder entry) { } } diff --git a/src/main/java/com/demcha/compose/document/dsl/TimelineEntryBuilder.java b/src/main/java/com/demcha/compose/document/dsl/TimelineEntryBuilder.java index fcb0431f7..aed8216b9 100644 --- a/src/main/java/com/demcha/compose/document/dsl/TimelineEntryBuilder.java +++ b/src/main/java/com/demcha/compose/document/dsl/TimelineEntryBuilder.java @@ -78,7 +78,7 @@ public TimelineEntryBuilder meta(String meta) { /** * Sets the meta line with a per-entry style override. * - * @param meta meta text + * @param meta meta text * @param style meta text style * @return this builder */ @@ -113,7 +113,7 @@ public TimelineEntryBuilder body(String body) { /** * Sets the entry body with a per-entry style override. * - * @param body body text + * @param body body text * @param style body text style * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/dsl/TimelineMarker.java b/src/main/java/com/demcha/compose/document/dsl/TimelineMarker.java index 19e3a2168..3ea83ddac 100644 --- a/src/main/java/com/demcha/compose/document/dsl/TimelineMarker.java +++ b/src/main/java/com/demcha/compose/document/dsl/TimelineMarker.java @@ -1,11 +1,7 @@ package com.demcha.compose.document.dsl; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.font.FontName; import java.util.function.Consumer; @@ -36,7 +32,7 @@ private TimelineMarker(double size, Consumer recipe) { /** * A solid filled dot. * - * @param size diameter in points + * @param size diameter in points * @param color fill colour * @return the marker */ @@ -47,8 +43,8 @@ public static TimelineMarker dot(double size, DocumentColor color) { /** * An outlined circle (filled and/or stroked). * - * @param size diameter in points - * @param fill fill colour, or {@code null} for an unfilled ring + * @param size diameter in points + * @param fill fill colour, or {@code null} for an unfilled ring * @param stroke outline stroke, or {@code null} for no outline * @return the marker */ @@ -66,9 +62,9 @@ public static TimelineMarker circle(double size, DocumentColor fill, DocumentStr /** * A numbered disc — a filled circle with a centred number. * - * @param number the step number to centre in the disc - * @param size diameter in points - * @param fill disc fill colour + * @param number the step number to centre in the disc + * @param size diameter in points + * @param fill disc fill colour * @param textColor number colour; {@code null} falls back to white * @return the marker */ diff --git a/src/main/java/com/demcha/compose/document/dsl/internal/BuilderSupport.java b/src/main/java/com/demcha/compose/document/dsl/internal/BuilderSupport.java index ea7f8a42c..eeaf06480 100644 --- a/src/main/java/com/demcha/compose/document/dsl/internal/BuilderSupport.java +++ b/src/main/java/com/demcha/compose/document/dsl/internal/BuilderSupport.java @@ -3,7 +3,9 @@ import java.util.Objects; import java.util.function.Consumer; -/** Internal helper for applying builder customizers. */ +/** + * Internal helper for applying builder customizers. + */ public final class BuilderSupport { private BuilderSupport() { } @@ -12,8 +14,8 @@ private BuilderSupport() { * Applies a non-null customizer to the supplied builder and returns it. * * @param builder builder being configured - * @param spec callback that mutates the builder - * @param builder type + * @param spec callback that mutates the builder + * @param builder type * @return the same builder instance */ public static B configure(B builder, Consumer spec) { diff --git a/src/main/java/com/demcha/compose/document/dsl/internal/SemanticNameNormalizer.java b/src/main/java/com/demcha/compose/document/dsl/internal/SemanticNameNormalizer.java index c3471bc8d..be92872ef 100644 --- a/src/main/java/com/demcha/compose/document/dsl/internal/SemanticNameNormalizer.java +++ b/src/main/java/com/demcha/compose/document/dsl/internal/SemanticNameNormalizer.java @@ -1,6 +1,8 @@ package com.demcha.compose.document.dsl.internal; -/** Normalizes free-form labels into stable semantic node names. */ +/** + * Normalizes free-form labels into stable semantic node names. + */ public final class SemanticNameNormalizer { private SemanticNameNormalizer() { } diff --git a/src/main/java/com/demcha/compose/document/exceptions/DocumentRenderingException.java b/src/main/java/com/demcha/compose/document/exceptions/DocumentRenderingException.java index fc78ef120..46edfb8ef 100644 --- a/src/main/java/com/demcha/compose/document/exceptions/DocumentRenderingException.java +++ b/src/main/java/com/demcha/compose/document/exceptions/DocumentRenderingException.java @@ -25,7 +25,7 @@ public class DocumentRenderingException extends RuntimeException { * Creates a rendering exception with a message and a wrapped cause. * * @param message diagnostic message describing what failed - * @param cause underlying exception thrown by the rendering pipeline + * @param cause underlying exception thrown by the rendering pipeline */ public DocumentRenderingException(String message, Throwable cause) { super(message, cause); diff --git a/src/main/java/com/demcha/compose/document/layout/BoxConstraints.java b/src/main/java/com/demcha/compose/document/layout/BoxConstraints.java index d89bc5373..49e2d9689 100644 --- a/src/main/java/com/demcha/compose/document/layout/BoxConstraints.java +++ b/src/main/java/com/demcha/compose/document/layout/BoxConstraints.java @@ -3,7 +3,7 @@ /** * Available layout space for one node measurement/layout step. * - * @param availableWidth available content width + * @param availableWidth available content width * @param availableHeight available content height */ public record BoxConstraints(double availableWidth, double availableHeight) { diff --git a/src/main/java/com/demcha/compose/document/layout/BuiltInNodeDefinitions.java b/src/main/java/com/demcha/compose/document/layout/BuiltInNodeDefinitions.java index 69e5b5d19..8a9094951 100644 --- a/src/main/java/com/demcha/compose/document/layout/BuiltInNodeDefinitions.java +++ b/src/main/java/com/demcha/compose/document/layout/BuiltInNodeDefinitions.java @@ -1,23 +1,6 @@ package com.demcha.compose.document.layout; -import com.demcha.compose.document.layout.definitions.BarcodeDefinition; -import com.demcha.compose.document.layout.definitions.CanvasLayerDefinition; -import com.demcha.compose.document.layout.definitions.ChartDefinition; -import com.demcha.compose.document.layout.definitions.ContainerDefinition; -import com.demcha.compose.document.layout.definitions.EllipseDefinition; -import com.demcha.compose.document.layout.definitions.ImageDefinition; -import com.demcha.compose.document.layout.definitions.LayerStackDefinition; -import com.demcha.compose.document.layout.definitions.LineDefinition; -import com.demcha.compose.document.layout.definitions.ListDefinition; -import com.demcha.compose.document.layout.definitions.PageBreakDefinition; -import com.demcha.compose.document.layout.definitions.ParagraphDefinition; -import com.demcha.compose.document.layout.definitions.PolygonDefinition; -import com.demcha.compose.document.layout.definitions.RowDefinition; -import com.demcha.compose.document.layout.definitions.SectionDefinition; -import com.demcha.compose.document.layout.definitions.ShapeContainerDefinition; -import com.demcha.compose.document.layout.definitions.ShapeDefinition; -import com.demcha.compose.document.layout.definitions.SpacerDefinition; -import com.demcha.compose.document.layout.definitions.TableDefinition; +import com.demcha.compose.document.layout.definitions.*; import java.util.Objects; diff --git a/src/main/java/com/demcha/compose/document/layout/CompositeLayoutSpec.java b/src/main/java/com/demcha/compose/document/layout/CompositeLayoutSpec.java index e2281e406..7dd9d0070 100644 --- a/src/main/java/com/demcha/compose/document/layout/CompositeLayoutSpec.java +++ b/src/main/java/com/demcha/compose/document/layout/CompositeLayoutSpec.java @@ -10,26 +10,10 @@ * the row's inner width is distributed across children.

* * @param spacing spacing between child nodes (vertical for {@link Axis#VERTICAL}, horizontal for {@link Axis#HORIZONTAL}) - * @param axis composite stacking axis + * @param axis composite stacking axis * @param weights optional per-child weights (only consulted for {@link Axis#HORIZONTAL}) */ public record CompositeLayoutSpec(double spacing, Axis axis, List weights) { - /** - * Composite stacking axis. - */ - public enum Axis { - /** Children stack top to bottom. */ - VERTICAL, - /** Children flow left to right inside a single row band. */ - HORIZONTAL, - /** - * Children share the same bounding box and are painted in source order - * (first child behind, last child in front). Used by {@code LayerStackNode} - * to compose background panels, watermarks, and overlay decorations. - */ - STACK - } - /** * Creates a validated composite child-layout contract. */ @@ -59,9 +43,29 @@ public CompositeLayoutSpec(double spacing) { * Convenience constructor without explicit weights. * * @param spacing spacing between children - * @param axis stacking axis + * @param axis stacking axis */ public CompositeLayoutSpec(double spacing, Axis axis) { this(spacing, axis, List.of()); } + + /** + * Composite stacking axis. + */ + public enum Axis { + /** + * Children stack top to bottom. + */ + VERTICAL, + /** + * Children flow left to right inside a single row band. + */ + HORIZONTAL, + /** + * Children share the same bounding box and are painted in source order + * (first child behind, last child in front). Used by {@code LayerStackNode} + * to compose background panels, watermarks, and overlay decorations. + */ + STACK + } } diff --git a/src/main/java/com/demcha/compose/document/layout/DocumentLayoutPassContext.java b/src/main/java/com/demcha/compose/document/layout/DocumentLayoutPassContext.java index ae5b26ee6..1bd885b38 100644 --- a/src/main/java/com/demcha/compose/document/layout/DocumentLayoutPassContext.java +++ b/src/main/java/com/demcha/compose/document/layout/DocumentLayoutPassContext.java @@ -30,11 +30,11 @@ public final class DocumentLayoutPassContext implements PrepareContext, Fragment /** * Creates a layout-pass context. * - * @param registry semantic node registry used for preparation - * @param canvas active layout canvas - * @param fontLibrary document font library + * @param registry semantic node registry used for preparation + * @param canvas active layout canvas + * @param fontLibrary document font library * @param textMeasurementSystem text measurement service for this pass - * @param markdown whether paragraph markdown parsing is enabled + * @param markdown whether paragraph markdown parsing is enabled */ public DocumentLayoutPassContext(NodeRegistry registry, LayoutCanvas canvas, diff --git a/src/main/java/com/demcha/compose/document/layout/DocumentNodeAdapters.java b/src/main/java/com/demcha/compose/document/layout/DocumentNodeAdapters.java index d566b88d2..7ec2c4df8 100644 --- a/src/main/java/com/demcha/compose/document/layout/DocumentNodeAdapters.java +++ b/src/main/java/com/demcha/compose/document/layout/DocumentNodeAdapters.java @@ -1,11 +1,7 @@ package com.demcha.compose.document.layout; import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableCell; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; diff --git a/src/main/java/com/demcha/compose/document/layout/FixedSlotPlacementContext.java b/src/main/java/com/demcha/compose/document/layout/FixedSlotPlacementContext.java index 1305405e3..3f27efbdc 100644 --- a/src/main/java/com/demcha/compose/document/layout/FixedSlotPlacementContext.java +++ b/src/main/java/com/demcha/compose/document/layout/FixedSlotPlacementContext.java @@ -8,12 +8,12 @@ * place into a fixed page band — the parent flow has already decided which * page is being filled, so children must not move on by themselves. * - * @param pageIndex pinned page index that placements land on - * @param canvas canvas the placement is happening on - * @param prepareContext prepare-phase context used to (re)measure children + * @param pageIndex pinned page index that placements land on + * @param canvas canvas the placement is happening on + * @param prepareContext prepare-phase context used to (re)measure children * @param fragmentContext fragment-emission context forwarded to {@code emitFragments} - * @param nodes mutable list of placed semantic nodes; helpers append to this - * @param fragments mutable list of placed render fragments; helpers append to this + * @param nodes mutable list of placed semantic nodes; helpers append to this + * @param fragments mutable list of placed render fragments; helpers append to this * @author Artem Demchyshyn */ public record FixedSlotPlacementContext( @@ -34,7 +34,7 @@ public boolean canAdvancePage() { public void advancePage() { throw new IllegalStateException( "FixedSlotPlacementContext is locked to page " + pageIndex - + " and cannot advance pages."); + + " and cannot advance pages."); } @Override diff --git a/src/main/java/com/demcha/compose/document/layout/FragmentContext.java b/src/main/java/com/demcha/compose/document/layout/FragmentContext.java index ccc2894b3..5bd0572dc 100644 --- a/src/main/java/com/demcha/compose/document/layout/FragmentContext.java +++ b/src/main/java/com/demcha/compose/document/layout/FragmentContext.java @@ -1,8 +1,8 @@ package com.demcha.compose.document.layout; import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.font.FontLibrary; import com.demcha.compose.engine.measurement.TextMeasurementSystem; +import com.demcha.compose.font.FontLibrary; import java.util.List; @@ -52,15 +52,15 @@ default boolean markdownEnabled() { * {@code FragmentContext} implementations have to opt-in to the * recursion.

* - * @param child prepared child node previously obtained from - * {@link PrepareContext#prepare(DocumentNode, BoxConstraints)} + * @param child prepared child node previously obtained from + * {@link PrepareContext#prepare(DocumentNode, BoxConstraints)} * @param placement placement assigned to the child within the * composite parent's geometry - * @param child node type + * @param child node type * @return fragments emitted by the child's {@code NodeDefinition} * @throws UnsupportedOperationException when the - * {@code FragmentContext} implementation does not back - * child-fragment emission + * {@code FragmentContext} implementation does not back + * child-fragment emission */ default List emitChildFragments( PreparedNode child, diff --git a/src/main/java/com/demcha/compose/document/layout/FragmentPlacement.java b/src/main/java/com/demcha/compose/document/layout/FragmentPlacement.java index c02ed6f38..a6be0261d 100644 --- a/src/main/java/com/demcha/compose/document/layout/FragmentPlacement.java +++ b/src/main/java/com/demcha/compose/document/layout/FragmentPlacement.java @@ -6,19 +6,19 @@ /** * Resolved placement context for fragment emission. * - * @param path stable semantic path for the placed node + * @param path stable semantic path for the placed node * @param parentPath parent semantic path, or {@code null} for a root * @param childIndex index within the parent child list - * @param depth depth in the semantic tree - * @param pageIndex page that receives this fragment - * @param x absolute page x coordinate - * @param y absolute page y coordinate - * @param width resolved fragment width - * @param height resolved fragment height - * @param startPage first page occupied by the owning node - * @param endPage last page occupied by the owning node - * @param margin resolved outer margin - * @param padding resolved inner padding + * @param depth depth in the semantic tree + * @param pageIndex page that receives this fragment + * @param x absolute page x coordinate + * @param y absolute page y coordinate + * @param width resolved fragment width + * @param height resolved fragment height + * @param startPage first page occupied by the owning node + * @param endPage last page occupied by the owning node + * @param margin resolved outer margin + * @param padding resolved inner padding */ public record FragmentPlacement( String path, diff --git a/src/main/java/com/demcha/compose/document/layout/LayoutCanvas.java b/src/main/java/com/demcha/compose/document/layout/LayoutCanvas.java index 8f916704f..b7d05bbc0 100644 --- a/src/main/java/com/demcha/compose/document/layout/LayoutCanvas.java +++ b/src/main/java/com/demcha/compose/document/layout/LayoutCanvas.java @@ -5,18 +5,18 @@ /** * Page geometry used by the v2 compiler and backends. * - * @param width full page width - * @param height full page height - * @param innerWidth page width after horizontal margins + * @param width full page width + * @param height full page height + * @param innerWidth page width after horizontal margins * @param innerHeight page height after vertical margins - * @param margin page margin + * @param margin page margin */ public record LayoutCanvas(double width, double height, double innerWidth, double innerHeight, Margin margin) { /** * Creates canvas geometry from backend-neutral page dimensions and margin. * - * @param width physical page width + * @param width physical page width * @param height physical page height * @param margin page margin; null becomes zero margin * @return normalized canvas geometry diff --git a/src/main/java/com/demcha/compose/document/layout/LayoutCompiler.java b/src/main/java/com/demcha/compose/document/layout/LayoutCompiler.java index ed846f556..d775f7dee 100644 --- a/src/main/java/com/demcha/compose/document/layout/LayoutCompiler.java +++ b/src/main/java/com/demcha/compose/document/layout/LayoutCompiler.java @@ -1,12 +1,12 @@ package com.demcha.compose.document.layout; +import com.demcha.compose.document.exceptions.AtomicNodeTooLargeException; import com.demcha.compose.document.layout.payloads.PreparedStackLayout; import com.demcha.compose.document.node.DocumentNode; +import com.demcha.compose.document.node.LayerStackNode; import com.demcha.compose.document.node.PageBreakNode; - import com.demcha.compose.engine.components.style.Margin; import com.demcha.compose.engine.components.style.Padding; -import com.demcha.compose.document.exceptions.AtomicNodeTooLargeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,26 +40,6 @@ public final class LayoutCompiler { * full page at all?" check.

*/ private static final double CAPACITY_TOLERANCE = 0.5; - - /** - * Identifies the kind of fixed slot a child is being compiled into, - * so the validator can distinguish "child of a horizontal row band" - * (where a nested {@code Row} would create real composition conflict) - * from "child of a {@link com.demcha.compose.document.node.LayerStackNode} - * layer" (where a nested {@code Row} is a normal column-row inside an - * already-fixed layer rectangle). - * - *

{@link #compileNodeInFixedSlot} takes the kind as a parameter - * and propagates it down recursive calls so the validator can - * relax just for STACK layer parents.

- */ - private enum FixedSlotKind { - /** Child sits inside a horizontal row band (column of a row). */ - ROW_SLOT, - /** Child sits inside a {@link LayerStackNode} layer rectangle. */ - STACK_LAYER_SLOT - } - private final NodeRegistry registry; /** @@ -72,11 +52,114 @@ public LayoutCompiler(NodeRegistry registry) { this.registry = Objects.requireNonNull(registry, "registry"); } + /** + * Returns an iteration order over {@code zIndices} that is stable on + * ties. Layers with equal {@code zIndex} keep their source order, so + * the default of all-zero zIndices yields the identity permutation + * {@code [0, 1, ..., n-1]} and existing snapshots stay deterministic. + * + * @param zIndices per-layer render-order keys (in source order) + * @return source indices sorted by ascending {@code zIndex}, stable + * on ties + */ + private static int[] stableZIndexOrder(java.util.List zIndices) { + int n = zIndices.size(); + if (n <= 1) { + return identityOrder(n); + } + // Common case: every layer uses the same zIndex (typically 0). A + // stable sort would preserve source order anyway, so skip the boxed + // array allocation and the full sort. + int firstZ = zIndices.get(0); + boolean allEqual = true; + for (int i = 1; i < n; i++) { + if (zIndices.get(i) != firstZ) { + allEqual = false; + break; + } + } + if (allEqual) { + return identityOrder(n); + } + Integer[] boxed = new Integer[n]; + for (int i = 0; i < n; i++) { + boxed[i] = i; + } + // Comparator.comparingInt + java.util.Arrays.sort on boxed array is + // documented stable; primitive int[] sort is not. + java.util.Arrays.sort(boxed, java.util.Comparator.comparingInt(zIndices::get)); + int[] order = new int[n]; + for (int i = 0; i < n; i++) { + order[i] = boxed[i]; + } + return order; + } + + private static int[] identityOrder(int n) { + int[] order = new int[n]; + for (int i = 0; i < n; i++) { + order[i] = i; + } + return order; + } + + private static double horizontalLayerOffset(com.demcha.compose.document.node.LayerAlign align, + double innerWidth, + double childOuterWidth) { + return switch (align) { + case TOP_LEFT, CENTER_LEFT, BOTTOM_LEFT -> 0.0; + case TOP_CENTER, CENTER, BOTTOM_CENTER -> Math.max(0.0, (innerWidth - childOuterWidth) / 2.0); + case TOP_RIGHT, CENTER_RIGHT, BOTTOM_RIGHT -> Math.max(0.0, innerWidth - childOuterWidth); + }; + } + + private static double verticalLayerOffset(com.demcha.compose.document.node.LayerAlign align, + double innerHeight, + double childOuterHeight) { + return switch (align) { + case TOP_LEFT, TOP_CENTER, TOP_RIGHT -> 0.0; + case CENTER_LEFT, CENTER, CENTER_RIGHT -> Math.max(0.0, (innerHeight - childOuterHeight) / 2.0); + case BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT -> Math.max(0.0, innerHeight - childOuterHeight); + }; + } + + private static double[] distributeRowSlotWidths(List children, + List weights, + double gap, + double innerWidth) { + int n = children.size(); + double available = Math.max(0.0, innerWidth - gap * Math.max(0, n - 1)); + double[] slots = new double[n]; + if (weights == null || weights.isEmpty()) { + double share = n > 0 ? available / n : 0.0; + for (int i = 0; i < n; i++) { + slots[i] = share; + } + return slots; + } + RowSlots.validateWeightsMatchChildren(weights, n); + double total = 0.0; + for (double w : weights) { + total += w; + } + if (total <= 0.0) { + double share = n > 0 ? available / n : 0.0; + for (int i = 0; i < n; i++) { + slots[i] = share; + } + return slots; + } + for (int i = 0; i < n; i++) { + slots[i] = available * (weights.get(i) / total); + } + return slots; + } + /** * Compiles semantic roots into placed nodes and renderable fragments. * - * @param graph semantic document graph - * @param prepareContext node preparation context + * @param graph semantic document graph + * @param prepareContext node preparation context * @param fragmentContext fragment emission context * @return fixed-layout graph ready for rendering or snapshot extraction */ @@ -157,15 +240,15 @@ private void compileNode(PreparedNode prepared, if (availableWidth <= EPS) { throw new IllegalStateException("Node '" + path - + "' has no horizontal layout space. " - + "Reduce padding or margin on the parent, or increase the page width."); + + "' has no horizontal layout space. " + + "Reduce padding or margin on the parent, or increase the page width."); } MeasureResult naturalMeasure = prepared.measureResult(); if (naturalMeasure.width() > availableWidth + EPS) { throw new IllegalStateException("Node '" + path + "' measured width " + naturalMeasure.width() - + " exceeds available width " + availableWidth + ". " - + "Reduce the node width, shorten inline content, or wrap content in a smaller container."); + + " exceeds available width " + availableWidth + ". " + + "Reduce the node width, shorten inline content, or wrap content in a smaller container."); } if (prepared.isComposite()) { @@ -264,7 +347,7 @@ private void compileComposite(PreparedNode prepared, // existing layouts are unchanged. double outerHeight = naturalMeasure.height() + margin.vertical(); boolean keepWhole = node.keepTogether() - && outerHeight <= state.canvas.innerHeight() + CAPACITY_TOLERANCE; + && outerHeight <= state.canvas.innerHeight() + CAPACITY_TOLERANCE; double startReservation = margin.top() + padding.top(); if (keepWhole && outerHeight > state.remainingHeight() + EPS && state.usedHeight > EPS) { state.newPage(); @@ -412,8 +495,8 @@ private void compileHorizontalRow(PreparedNode prepared, (NodeDefinition) registry.definitionFor(child); if (childMeasure.height() > naturalMeasure.height() - padding.vertical() + EPS) { throw new IllegalStateException("Row '" + path + "' child '" + child.nodeKind() - + "' measured height " + childMeasure.height() + " exceeds row inner height. " - + "Reduce the child height, shorten its content, or increase the row height."); + + "' measured height " + childMeasure.height() + " exceeds row inner height. " + + "Reduce the child height, shorten its content, or increase the row height."); } if (childPrepared.isComposite()) { @@ -671,109 +754,6 @@ private void compileStackedLayer(PreparedNode prepared, state.usedHeight += stackOuterHeight; } - /** - * Returns an iteration order over {@code zIndices} that is stable on - * ties. Layers with equal {@code zIndex} keep their source order, so - * the default of all-zero zIndices yields the identity permutation - * {@code [0, 1, ..., n-1]} and existing snapshots stay deterministic. - * - * @param zIndices per-layer render-order keys (in source order) - * @return source indices sorted by ascending {@code zIndex}, stable - * on ties - */ - private static int[] stableZIndexOrder(java.util.List zIndices) { - int n = zIndices.size(); - if (n <= 1) { - return identityOrder(n); - } - // Common case: every layer uses the same zIndex (typically 0). A - // stable sort would preserve source order anyway, so skip the boxed - // array allocation and the full sort. - int firstZ = zIndices.get(0); - boolean allEqual = true; - for (int i = 1; i < n; i++) { - if (zIndices.get(i) != firstZ) { - allEqual = false; - break; - } - } - if (allEqual) { - return identityOrder(n); - } - Integer[] boxed = new Integer[n]; - for (int i = 0; i < n; i++) { - boxed[i] = i; - } - // Comparator.comparingInt + java.util.Arrays.sort on boxed array is - // documented stable; primitive int[] sort is not. - java.util.Arrays.sort(boxed, java.util.Comparator.comparingInt(zIndices::get)); - int[] order = new int[n]; - for (int i = 0; i < n; i++) { - order[i] = boxed[i]; - } - return order; - } - - private static int[] identityOrder(int n) { - int[] order = new int[n]; - for (int i = 0; i < n; i++) { - order[i] = i; - } - return order; - } - - private static double horizontalLayerOffset(com.demcha.compose.document.node.LayerAlign align, - double innerWidth, - double childOuterWidth) { - return switch (align) { - case TOP_LEFT, CENTER_LEFT, BOTTOM_LEFT -> 0.0; - case TOP_CENTER, CENTER, BOTTOM_CENTER -> Math.max(0.0, (innerWidth - childOuterWidth) / 2.0); - case TOP_RIGHT, CENTER_RIGHT, BOTTOM_RIGHT -> Math.max(0.0, innerWidth - childOuterWidth); - }; - } - - private static double verticalLayerOffset(com.demcha.compose.document.node.LayerAlign align, - double innerHeight, - double childOuterHeight) { - return switch (align) { - case TOP_LEFT, TOP_CENTER, TOP_RIGHT -> 0.0; - case CENTER_LEFT, CENTER, CENTER_RIGHT -> Math.max(0.0, (innerHeight - childOuterHeight) / 2.0); - case BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT -> Math.max(0.0, innerHeight - childOuterHeight); - }; - } - - private static double[] distributeRowSlotWidths(List children, - List weights, - double gap, - double innerWidth) { - int n = children.size(); - double available = Math.max(0.0, innerWidth - gap * Math.max(0, n - 1)); - double[] slots = new double[n]; - if (weights == null || weights.isEmpty()) { - double share = n > 0 ? available / n : 0.0; - for (int i = 0; i < n; i++) { - slots[i] = share; - } - return slots; - } - RowSlots.validateWeightsMatchChildren(weights, n); - double total = 0.0; - for (double w : weights) { - total += w; - } - if (total <= 0.0) { - double share = n > 0 ? available / n : 0.0; - for (int i = 0; i < n; i++) { - slots[i] = share; - } - return slots; - } - for (int i = 0; i < n; i++) { - slots[i] = available * (weights.get(i) / total); - } - return slots; - } - private void compileAtomicLeaf(PreparedNode prepared, NodeDefinition definition, String path, @@ -911,11 +891,11 @@ private void placeStackLayer(DocumentNode child, // offsetX > 0 nudges the layer right; offsetY > 0 nudges it down // (PDF y grows upward, so "down" subtracts from the top-Y). double alignedSlotX = innerStartX - + horizontalLayerOffset(align, innerWidth, childOuterWidth) - + layerOffsetX; + + horizontalLayerOffset(align, innerWidth, childOuterWidth) + + layerOffsetX; double alignedSlotTopY = innerTopY - - verticalLayerOffset(align, innerHeight, childOuterHeight) - - layerOffsetY; + - verticalLayerOffset(align, innerHeight, childOuterHeight) + - layerOffsetY; // Layers always paint into a fixed page band — even when the // surrounding flow is mutating, the overlay is pinned to ctx's @@ -923,12 +903,12 @@ private void placeStackLayer(DocumentNode child, PlacementContext layerCtx = ctx instanceof FixedSlotPlacementContext fixed ? fixed : new FixedSlotPlacementContext( - ctx.pageIndex(), - ctx.canvas(), - ctx.prepareContext(), - ctx.fragmentContext(), - ctx.nodes(), - ctx.fragments()); + ctx.pageIndex(), + ctx.canvas(), + ctx.prepareContext(), + ctx.fragmentContext(), + ctx.nodes(), + ctx.fragments()); // Child sits inside a LayerStack layer rectangle — the validator // can relax for STACK_LAYER_SLOT because there is no competing @@ -1033,8 +1013,8 @@ private void compileSplittableLeaf(PreparedNode prepared, } if (tail != null && tail.equals(current)) { throw new IllegalStateException("Split did not make progress for node '" + path - + "'. The node's NodeDefinition.split() returned the original input as the tail — " - + "check the definition for an infinite split loop and ensure each split advances."); + + "'. The node's NodeDefinition.split() returned the original input as the tail — " + + "check the definition for an infinite split loop and ensure each split advances."); } DocumentNode headNode = head.node(); @@ -1128,7 +1108,7 @@ private void compileSplittableLeaf(PreparedNode prepared, * band.

* * @return outer height (measured height + vertical margin) consumed by the - * node, used by the caller's local y-cursor + * node, used by the caller's local y-cursor */ private double compileNodeInFixedSlot(PreparedNode prepared, String parentPath, @@ -1174,11 +1154,11 @@ private double compileNodeInFixedSlot(PreparedNode prepared, // because they are atomic and anchor their children inside // the existing slot. if (layoutSpec.axis() == CompositeLayoutSpec.Axis.HORIZONTAL - && kind == FixedSlotKind.ROW_SLOT) { + && kind == FixedSlotKind.ROW_SLOT) { throw new IllegalStateException("Row '" + path - + "' cannot contain a nested horizontal row. " - + "Wrap the inner row in a LayerStack layer (allowed since v1.6.2), " - + "or stack horizontal content as sections inside a vertical column."); + + "' cannot contain a nested horizontal row. " + + "Wrap the inner row in a LayerStack layer (allowed since v1.6.2), " + + "or stack horizontal content as sections inside a vertical column."); } int decorationInsertIndex = fragments.size(); @@ -1512,8 +1492,8 @@ private String pathFor(DocumentNode node, String parentPath, int childIndex) { base = node.nodeKind(); } String segment = base.trim() - .replace('\\', '_') - .replace('/', '_') + "[" + childIndex + "]"; + .replace('\\', '_') + .replace('/', '_') + "[" + childIndex + "]"; return parentPath == null ? segment : parentPath + "/" + segment; } @@ -1527,10 +1507,33 @@ private String semanticName(DocumentNode node) { private AtomicNodeTooLargeException atomicTooLarge(String path, double outerHeight, double pageHeight) { return new AtomicNodeTooLargeException( "Node '" + path + "' requires outer height " + outerHeight - + " but page capacity is " + pageHeight + ". " - + "Reduce the node height, split content into multiple atomic blocks, " - + "or increase the page size. Differences under 0.5 pt are tolerated as " - + "rounding noise (v1.6.2+)."); + + " but page capacity is " + pageHeight + ". " + + "Reduce the node height, split content into multiple atomic blocks, " + + "or increase the page size. Differences under 0.5 pt are tolerated as " + + "rounding noise (v1.6.2+)."); + } + + /** + * Identifies the kind of fixed slot a child is being compiled into, + * so the validator can distinguish "child of a horizontal row band" + * (where a nested {@code Row} would create real composition conflict) + * from "child of a {@link com.demcha.compose.document.node.LayerStackNode} + * layer" (where a nested {@code Row} is a normal column-row inside an + * already-fixed layer rectangle). + * + *

{@link #compileNodeInFixedSlot} takes the kind as a parameter + * and propagates it down recursive calls so the validator can + * relax just for STACK layer parents.

+ */ + private enum FixedSlotKind { + /** + * Child sits inside a horizontal row band (column of a row). + */ + ROW_SLOT, + /** + * Child sits inside a {@link LayerStackNode} layer rectangle. + */ + STACK_LAYER_SLOT } } diff --git a/src/main/java/com/demcha/compose/document/layout/LayoutFragment.java b/src/main/java/com/demcha/compose/document/layout/LayoutFragment.java index 58b5a5f30..5301962e5 100644 --- a/src/main/java/com/demcha/compose/document/layout/LayoutFragment.java +++ b/src/main/java/com/demcha/compose/document/layout/LayoutFragment.java @@ -3,13 +3,13 @@ /** * Page-agnostic fragment emitted by a node definition. * - * @param path stable semantic path for the fragment owner + * @param path stable semantic path for the fragment owner * @param fragmentIndex index within the owner's emitted fragments - * @param localX x offset relative to the owner placement - * @param localY y offset relative to the owner placement - * @param width fragment width - * @param height fragment height - * @param payload backend-specific fragment payload + * @param localX x offset relative to the owner placement + * @param localY y offset relative to the owner placement + * @param width fragment width + * @param height fragment height + * @param payload backend-specific fragment payload */ public record LayoutFragment( String path, diff --git a/src/main/java/com/demcha/compose/document/layout/LayoutGraph.java b/src/main/java/com/demcha/compose/document/layout/LayoutGraph.java index 48c3db076..d4f6eef58 100644 --- a/src/main/java/com/demcha/compose/document/layout/LayoutGraph.java +++ b/src/main/java/com/demcha/compose/document/layout/LayoutGraph.java @@ -6,10 +6,10 @@ /** * Canonical resolved v2 layout graph. * - * @param canvas physical page canvas used for the graph + * @param canvas physical page canvas used for the graph * @param totalPages number of pages required by the graph - * @param nodes placed semantic nodes in deterministic order - * @param fragments placed render fragments in deterministic order + * @param nodes placed semantic nodes in deterministic order + * @param fragments placed render fragments in deterministic order */ public record LayoutGraph( LayoutCanvas canvas, diff --git a/src/main/java/com/demcha/compose/document/layout/MeasureContext.java b/src/main/java/com/demcha/compose/document/layout/MeasureContext.java index 66d885684..3292032ff 100644 --- a/src/main/java/com/demcha/compose/document/layout/MeasureContext.java +++ b/src/main/java/com/demcha/compose/document/layout/MeasureContext.java @@ -1,9 +1,8 @@ package com.demcha.compose.document.layout; import com.demcha.compose.document.node.DocumentNode; - -import com.demcha.compose.font.FontLibrary; import com.demcha.compose.engine.measurement.TextMeasurementSystem; +import com.demcha.compose.font.FontLibrary; /** * Shared measurement context passed to node definitions. @@ -12,7 +11,7 @@ public interface MeasureContext { /** * Measures a semantic node under the supplied constraints. * - * @param node semantic node + * @param node semantic node * @param constraints available layout constraints * @return measured box size */ diff --git a/src/main/java/com/demcha/compose/document/layout/MeasureResult.java b/src/main/java/com/demcha/compose/document/layout/MeasureResult.java index bf63c91cc..a52e380da 100644 --- a/src/main/java/com/demcha/compose/document/layout/MeasureResult.java +++ b/src/main/java/com/demcha/compose/document/layout/MeasureResult.java @@ -3,7 +3,7 @@ /** * Measured node box size excluding margin. * - * @param width measured content width + * @param width measured content width * @param height measured content height */ public record MeasureResult(double width, double height) { diff --git a/src/main/java/com/demcha/compose/document/layout/NodeDefinition.java b/src/main/java/com/demcha/compose/document/layout/NodeDefinition.java index e4e253d23..56ab91470 100644 --- a/src/main/java/com/demcha/compose/document/layout/NodeDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/NodeDefinition.java @@ -35,8 +35,8 @@ public interface NodeDefinition { /** * Prepares one semantic node for later measurement, pagination, and fragment emission. * - * @param node semantic node instance being compiled - * @param ctx preparation context with measurement services and caches + * @param node semantic node instance being compiled + * @param ctx preparation context with measurement services and caches * @param constraints available layout space for this compilation step * @return prepared node carrying measured dimensions and optional prepared layout data */ @@ -54,7 +54,7 @@ public interface NodeDefinition { * Splits a prepared node when the current page cannot fit it whole. * * @param prepared prepared node candidate - * @param request split request describing remaining page space + * @param request split request describing remaining page space * @return split head/tail result, or throws when the node does not support splitting * @throws UnsupportedOperationException when the definition does not implement splitting */ @@ -75,8 +75,8 @@ default List children(E node) { /** * Emits renderer-facing fragments for one fully placed semantic node. * - * @param prepared prepared node being emitted - * @param ctx fragment emission context + * @param prepared prepared node being emitted + * @param ctx fragment emission context * @param placement resolved placement for the node * @return immutable list of emitted layout fragments */ @@ -97,8 +97,8 @@ default List children(E node) { * emitted here (so it sits after the children, restoring graphics * state on the same page).

* - * @param prepared prepared node being emitted - * @param ctx fragment emission context + * @param prepared prepared node being emitted + * @param ctx fragment emission context * @param placement resolved placement for the node * @return immutable list of overlay fragments, possibly empty */ diff --git a/src/main/java/com/demcha/compose/document/layout/NodeDefinitionSupport.java b/src/main/java/com/demcha/compose/document/layout/NodeDefinitionSupport.java index 5f8a0424c..396f89459 100644 --- a/src/main/java/com/demcha/compose/document/layout/NodeDefinitionSupport.java +++ b/src/main/java/com/demcha/compose/document/layout/NodeDefinitionSupport.java @@ -1,30 +1,16 @@ package com.demcha.compose.document.layout; import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.layout.payloads.ShapeFragmentPayload; -import com.demcha.compose.document.layout.payloads.SideBorders; -import com.demcha.compose.document.layout.payloads.TableRowFragmentPayload; -import com.demcha.compose.engine.components.content.table.TableResolvedCell; -import com.demcha.compose.document.layout.payloads.TransformBeginPayload; -import com.demcha.compose.document.layout.payloads.TransformEndPayload; -import com.demcha.compose.document.node.DocumentBarcodeOptions; -import com.demcha.compose.document.node.DocumentBarcodeType; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.ImageNode; -import com.demcha.compose.document.node.LayerStackNode; -import com.demcha.compose.document.node.RowNode; -import com.demcha.compose.document.node.TableNode; -import com.demcha.compose.document.style.DocumentBorders; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTransform; +import com.demcha.compose.document.layout.payloads.*; +import com.demcha.compose.document.node.*; +import com.demcha.compose.document.style.*; import com.demcha.compose.engine.components.content.ImageData; import com.demcha.compose.engine.components.content.barcode.BarcodeData; import com.demcha.compose.engine.components.content.shape.Stroke; +import com.demcha.compose.engine.components.content.table.TableResolvedCell; import com.demcha.compose.engine.components.style.Padding; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -82,7 +68,7 @@ public static ImageData toImageData(DocumentImageData imageData) { * Wraps an atomic leaf fragment with transform-begin / transform-end markers * when the transform is non-identity. * - * @param leaf resolved leaf fragment + * @param leaf resolved leaf fragment * @param placement resolved fragment placement * @param transform optional render-time transform * @return the leaf alone for identity transforms, otherwise begin/leaf/end @@ -123,11 +109,11 @@ public static List wrapAtomicWithTransform(LayoutFragment leaf, /** * Emits an optional background/border decoration fragment. * - * @param fillColor optional fill color - * @param stroke optional uniform stroke + * @param fillColor optional fill color + * @param stroke optional uniform stroke * @param cornerRadius optional per-corner radius - * @param sideBorders optional per-side borders - * @param placement resolved placement + * @param sideBorders optional per-side borders + * @param placement resolved placement * @return one shape fragment or an empty list when nothing should render */ public static List emitDecorationFragment(Color fillColor, @@ -142,10 +128,10 @@ public static List emitDecorationFragment(Color fillColor, /** * Emits an optional background/border decoration fragment. * - * @param fillColor optional fill color - * @param stroke optional uniform stroke + * @param fillColor optional fill color + * @param stroke optional uniform stroke * @param cornerRadius uniform corner radius - * @param placement resolved placement + * @param placement resolved placement * @return one shape fragment or an empty list when nothing should render */ public static List emitDecorationFragment(Color fillColor, @@ -158,11 +144,11 @@ public static List emitDecorationFragment(Color fillColor, /** * Emits an optional background/border decoration fragment. * - * @param fillColor optional fill color - * @param stroke optional uniform stroke + * @param fillColor optional fill color + * @param stroke optional uniform stroke * @param cornerRadius uniform corner radius - * @param sideBorders optional per-side borders - * @param placement resolved placement + * @param sideBorders optional per-side borders + * @param placement resolved placement * @return one shape fragment or an empty list when nothing should render */ public static List emitDecorationFragment(Color fillColor, @@ -219,7 +205,7 @@ public static BarcodeData toBarcodeData(DocumentBarcodeOptions options) { * Resolves image display dimensions from requested size, scale, intrinsic * metadata, and available width. * - * @param node image node to measure + * @param node image node to measure * @param availableWidth parent available width * @return resolved image dimensions excluding padding */ @@ -266,10 +252,10 @@ public static ImageDimensions resolveImageDimensions(ImageNode node, double avai * Measures a vertical composite node by preparing children inside the * padding-adjusted inner width. * - * @param children semantic child nodes - * @param spacing vertical spacing between children - * @param padding engine padding - * @param ctx prepare context + * @param children semantic child nodes + * @param spacing vertical spacing between children + * @param padding engine padding + * @param ctx prepare context * @param constraints parent constraints * @return measured outer size */ @@ -302,9 +288,9 @@ public static MeasureResult measureComposite(List children, /** * Measures a horizontal row by preparing each child in its weighted slot. * - * @param node row node - * @param padding engine padding - * @param ctx prepare context + * @param node row node + * @param padding engine padding + * @param ctx prepare context * @param constraints parent constraints * @return measured outer row size */ @@ -352,9 +338,9 @@ public static MeasureResult measureRow(RowNode node, * Measures a stack by preparing each layer inside the padding-adjusted * available width and taking the largest child outer box. * - * @param node layer stack node - * @param padding engine padding - * @param ctx prepare context + * @param node layer stack node + * @param padding engine padding + * @param ctx prepare context * @param constraints parent constraints * @return measured outer stack size */ @@ -385,8 +371,8 @@ public static MeasureResult measureStack(LayerStackNode node, /** * Prepares a table node through the package-local table layout support. * - * @param node table node - * @param ctx prepare context + * @param node table node + * @param ctx prepare context * @param constraints parent constraints * @return prepared table node */ @@ -410,7 +396,7 @@ public static PreparedNode prepareTable(TableNode node, * Splits a prepared table while preserving repeated-header semantics. * * @param prepared prepared table node - * @param request split request + * @param request split request * @return split result */ public static PreparedSplitResult splitTable(PreparedNode prepared, SplitRequest request) { @@ -458,8 +444,8 @@ public static PreparedSplitResult splitTable(PreparedNode /** * Emits row fragments for a prepared table. * - * @param prepared prepared table node - * @param ctx fragment-emission context + * @param prepared prepared table node + * @param ctx fragment-emission context * @param placement resolved fragment placement * @return renderer-facing table row fragments */ @@ -628,9 +614,9 @@ private static List emitDecorationFragment(Color fillColor, FragmentPlacement placement) { boolean hasFill = fillColor != null; boolean hasStroke = stroke != null - && stroke.strokeColor() != null - && stroke.strokeColor().color() != null - && stroke.width() > 0; + && stroke.strokeColor() != null + && stroke.strokeColor().color() != null + && stroke.width() > 0; boolean hasSideBorders = sideBorders != null && sideBorders.hasAny(); if ((!hasFill && !hasStroke && !hasSideBorders) || placement.width() <= EPS || placement.height() <= EPS) { return List.of(); @@ -652,7 +638,7 @@ private static List emitDecorationFragment(Color fillColor, /** * Resolved image dimensions excluding node padding. * - * @param width resolved width + * @param width resolved width * @param height resolved height */ public record ImageDimensions(double width, double height) { diff --git a/src/main/java/com/demcha/compose/document/layout/NodeRegistry.java b/src/main/java/com/demcha/compose/document/layout/NodeRegistry.java index 9c435885c..3c6646407 100644 --- a/src/main/java/com/demcha/compose/document/layout/NodeRegistry.java +++ b/src/main/java/com/demcha/compose/document/layout/NodeRegistry.java @@ -40,7 +40,7 @@ public NodeRegistry() { * Registers a semantic node definition. * * @param definition node definition - * @param semantic node type + * @param semantic node type * @return this registry */ public NodeRegistry register(NodeDefinition definition) { @@ -53,7 +53,7 @@ public NodeRegistry register(NodeDefinition definiti * Resolves the definition responsible for the supplied node instance. * * @param node semantic node - * @param semantic node type + * @param semantic node type * @return matching node definition */ @SuppressWarnings("unchecked") diff --git a/src/main/java/com/demcha/compose/document/layout/PlacedFragment.java b/src/main/java/com/demcha/compose/document/layout/PlacedFragment.java index 42171c919..e9bd4f504 100644 --- a/src/main/java/com/demcha/compose/document/layout/PlacedFragment.java +++ b/src/main/java/com/demcha/compose/document/layout/PlacedFragment.java @@ -6,16 +6,16 @@ /** * Concrete fragment resolved to a page and absolute page coordinates. * - * @param path stable semantic path for the fragment owner + * @param path stable semantic path for the fragment owner * @param fragmentIndex index within the owner's emitted fragments - * @param pageIndex page that contains this fragment - * @param x absolute page x coordinate - * @param y absolute page y coordinate - * @param width fragment width - * @param height fragment height - * @param margin owner margin used for diagnostics - * @param padding owner padding used for diagnostics - * @param payload backend-specific fragment payload + * @param pageIndex page that contains this fragment + * @param x absolute page x coordinate + * @param y absolute page y coordinate + * @param width fragment width + * @param height fragment height + * @param margin owner margin used for diagnostics + * @param padding owner padding used for diagnostics + * @param payload backend-specific fragment payload */ public record PlacedFragment( String path, @@ -32,7 +32,7 @@ public record PlacedFragment( /** * Places a local fragment into absolute page coordinates. * - * @param fragment fragment emitted by a node definition + * @param fragment fragment emitted by a node definition * @param placement owner placement metadata * @return placed fragment */ diff --git a/src/main/java/com/demcha/compose/document/layout/PlacedNode.java b/src/main/java/com/demcha/compose/document/layout/PlacedNode.java index 119fd8fab..cb136ed46 100644 --- a/src/main/java/com/demcha/compose/document/layout/PlacedNode.java +++ b/src/main/java/com/demcha/compose/document/layout/PlacedNode.java @@ -6,25 +6,25 @@ /** * Canonical laid-out semantic node entry in the v2 layout graph. * - * @param path stable semantic path for the node - * @param semanticName author-provided semantic name - * @param nodeKind canonical node kind - * @param parentPath parent semantic path, or {@code null} for a root - * @param childIndex index within the parent child list - * @param depth depth in the semantic tree - * @param layer render/layout layer - * @param computedX computed x coordinate before final placement offsets - * @param computedY computed y coordinate before final placement offsets - * @param placementX final placed x coordinate - * @param placementY final placed y coordinate - * @param placementWidth final placed width + * @param path stable semantic path for the node + * @param semanticName author-provided semantic name + * @param nodeKind canonical node kind + * @param parentPath parent semantic path, or {@code null} for a root + * @param childIndex index within the parent child list + * @param depth depth in the semantic tree + * @param layer render/layout layer + * @param computedX computed x coordinate before final placement offsets + * @param computedY computed y coordinate before final placement offsets + * @param placementX final placed x coordinate + * @param placementY final placed y coordinate + * @param placementWidth final placed width * @param placementHeight final placed height - * @param startPage first page occupied by the node - * @param endPage last page occupied by the node - * @param contentWidth measured content width - * @param contentHeight measured content height - * @param margin resolved outer margin - * @param padding resolved inner padding + * @param startPage first page occupied by the node + * @param endPage last page occupied by the node + * @param contentWidth measured content width + * @param contentHeight measured content height + * @param margin resolved outer margin + * @param padding resolved inner padding */ public record PlacedNode( String path, diff --git a/src/main/java/com/demcha/compose/document/layout/PrepareContext.java b/src/main/java/com/demcha/compose/document/layout/PrepareContext.java index b3d091c22..f95cb043b 100644 --- a/src/main/java/com/demcha/compose/document/layout/PrepareContext.java +++ b/src/main/java/com/demcha/compose/document/layout/PrepareContext.java @@ -1,9 +1,8 @@ package com.demcha.compose.document.layout; import com.demcha.compose.document.node.DocumentNode; - -import com.demcha.compose.font.FontLibrary; import com.demcha.compose.engine.measurement.TextMeasurementSystem; +import com.demcha.compose.font.FontLibrary; /** * Shared prepare context passed to node definitions. @@ -12,9 +11,9 @@ public interface PrepareContext { /** * Prepares a semantic node for later layout under the supplied constraints. * - * @param node semantic node + * @param node semantic node * @param constraints available layout constraints - * @param semantic node type + * @param semantic node type * @return prepared node with reusable measurement/layout payload */ PreparedNode prepare(E node, BoxConstraints constraints); diff --git a/src/main/java/com/demcha/compose/document/layout/PreparedNode.java b/src/main/java/com/demcha/compose/document/layout/PreparedNode.java index 371406127..3f1446f87 100644 --- a/src/main/java/com/demcha/compose/document/layout/PreparedNode.java +++ b/src/main/java/com/demcha/compose/document/layout/PreparedNode.java @@ -8,10 +8,10 @@ /** * Prepared semantic node with reusable measure and layout payload. * - * @param semantic node type - * @param node source semantic node - * @param measureResult measured node size - * @param preparedLayout node-specific reusable layout payload + * @param semantic node type + * @param node source semantic node + * @param measureResult measured node size + * @param preparedLayout node-specific reusable layout payload * @param compositeLayout optional composite child-layout metadata */ public record PreparedNode( @@ -20,10 +20,6 @@ public record PreparedNode( PreparedNodeLayout preparedLayout, Optional compositeLayout ) { - private enum EmptyPreparedLayout implements PreparedNodeLayout { - INSTANCE - } - /** * Normalizes optional layout payloads and validates required node state. */ @@ -37,9 +33,9 @@ private enum EmptyPreparedLayout implements PreparedNodeLayout { /** * Creates a prepared leaf node without a custom layout payload. * - * @param node semantic node + * @param node semantic node * @param measureResult measured node size - * @param semantic node type + * @param semantic node type * @return prepared leaf node */ public static PreparedNode leaf(E node, MeasureResult measureResult) { @@ -49,10 +45,10 @@ public static PreparedNode leaf(E node, MeasureResul /** * Creates a prepared leaf node with a reusable layout payload. * - * @param node semantic node - * @param measureResult measured node size + * @param node semantic node + * @param measureResult measured node size * @param preparedLayout node-specific layout payload - * @param semantic node type + * @param semantic node type * @return prepared leaf node */ public static PreparedNode leaf(E node, @@ -64,10 +60,10 @@ public static PreparedNode leaf(E node, /** * Creates a prepared composite node without a custom layout payload. * - * @param node semantic node - * @param measureResult measured node size + * @param node semantic node + * @param measureResult measured node size * @param compositeLayout composite child layout metadata - * @param semantic node type + * @param semantic node type * @return prepared composite node */ public static PreparedNode composite(E node, @@ -79,11 +75,11 @@ public static PreparedNode composite(E node, /** * Creates a prepared composite node with a reusable layout payload. * - * @param node semantic node - * @param measureResult measured node size - * @param preparedLayout node-specific layout payload + * @param node semantic node + * @param measureResult measured node size + * @param preparedLayout node-specific layout payload * @param compositeLayout composite child layout metadata - * @param semantic node type + * @param semantic node type * @return prepared composite node */ public static PreparedNode composite(E node, @@ -116,17 +112,21 @@ public CompositeLayoutSpec requireCompositeLayout() { * Returns the prepared layout payload as a concrete type. * * @param layoutType required layout payload type - * @param layout payload type + * @param layout payload type * @return typed prepared layout payload */ public T requirePreparedLayout(Class layoutType) { Objects.requireNonNull(layoutType, "layoutType"); if (!layoutType.isInstance(preparedLayout)) { throw new IllegalStateException("Prepared node '" + node.nodeKind() - + "' does not carry layout payload " + layoutType.getSimpleName() + "."); + + "' does not carry layout payload " + layoutType.getSimpleName() + "."); } return layoutType.cast(preparedLayout); } + + private enum EmptyPreparedLayout implements PreparedNodeLayout { + INSTANCE + } } diff --git a/src/main/java/com/demcha/compose/document/layout/PreparedSplitResult.java b/src/main/java/com/demcha/compose/document/layout/PreparedSplitResult.java index c1b2d1e4a..1acbfda49 100644 --- a/src/main/java/com/demcha/compose/document/layout/PreparedSplitResult.java +++ b/src/main/java/com/demcha/compose/document/layout/PreparedSplitResult.java @@ -5,7 +5,7 @@ /** * Result of splitting a prepared semantic node into head/tail pieces. * - * @param semantic node type + * @param semantic node type * @param head first prepared node fragment, or the whole node when unsplit * @param tail remaining prepared node fragment, or {@code null} when unsplit */ @@ -14,7 +14,7 @@ public record PreparedSplitResult(PreparedNode head, * Creates an unsplit result where the original node remains whole. * * @param node prepared node - * @param semantic node type + * @param semantic node type * @return whole-node split result */ public static PreparedSplitResult whole(PreparedNode node) { diff --git a/src/main/java/com/demcha/compose/document/layout/RowSlots.java b/src/main/java/com/demcha/compose/document/layout/RowSlots.java index 8b11eb20d..32cfb3b93 100644 --- a/src/main/java/com/demcha/compose/document/layout/RowSlots.java +++ b/src/main/java/com/demcha/compose/document/layout/RowSlots.java @@ -29,7 +29,7 @@ private RowSlots() { * children count. Callers must skip this check when {@code weights} * is null or empty — the even-split fallback applies there instead. * - * @param weights non-null, non-empty weights list + * @param weights non-null, non-empty weights list * @param childCount number of row children * @throws IllegalArgumentException if {@code weights.size() != childCount} */ @@ -37,8 +37,8 @@ static void validateWeightsMatchChildren(List weights, int childCount) { if (weights.size() != childCount) { throw new IllegalArgumentException( "Row weights size (" + weights.size() + ") must match children size (" - + childCount + "). Pass exactly " + childCount - + " weight(s) or leave weights empty for an even split."); + + childCount + "). Pass exactly " + childCount + + " weight(s) or leave weights empty for an even split."); } } } diff --git a/src/main/java/com/demcha/compose/document/layout/SplitRequest.java b/src/main/java/com/demcha/compose/document/layout/SplitRequest.java index 6b367f6a1..8cbce11b3 100644 --- a/src/main/java/com/demcha/compose/document/layout/SplitRequest.java +++ b/src/main/java/com/demcha/compose/document/layout/SplitRequest.java @@ -3,10 +3,10 @@ /** * Split request for a splittable semantic node. * - * @param constraints available layout space for the split + * @param constraints available layout space for the split * @param remainingHeight remaining height on the current page * @param pageInnerHeight full inner page height for tail preparation - * @param context active prepare context used by split logic + * @param context active prepare context used by split logic */ public record SplitRequest( BoxConstraints constraints, diff --git a/src/main/java/com/demcha/compose/document/layout/SplitResult.java b/src/main/java/com/demcha/compose/document/layout/SplitResult.java index 11c03171b..363968190 100644 --- a/src/main/java/com/demcha/compose/document/layout/SplitResult.java +++ b/src/main/java/com/demcha/compose/document/layout/SplitResult.java @@ -5,7 +5,7 @@ /** * Result of splitting a semantic node into head/tail pieces. * - * @param semantic node type + * @param semantic node type * @param head first semantic node fragment, or the whole node when unsplit * @param tail remaining semantic node fragment, or {@code null} when unsplit */ @@ -14,7 +14,7 @@ public record SplitResult(E head, E tail) { * Creates an unsplit result where the original node remains whole. * * @param node semantic node - * @param semantic node type + * @param semantic node type * @return whole-node split result */ public static SplitResult whole(E node) { diff --git a/src/main/java/com/demcha/compose/document/layout/TableLayoutSupport.java b/src/main/java/com/demcha/compose/document/layout/TableLayoutSupport.java index 21d525d35..d830d47ad 100644 --- a/src/main/java/com/demcha/compose/document/layout/TableLayoutSupport.java +++ b/src/main/java/com/demcha/compose/document/layout/TableLayoutSupport.java @@ -12,17 +12,9 @@ import com.demcha.compose.engine.components.style.Padding; import com.demcha.compose.engine.measurement.TextMeasurementSystem; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toTableCell; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toTableColumns; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toTableStyle; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toTableStyles; +import java.util.*; + +import static com.demcha.compose.document.layout.DocumentNodeAdapters.*; /** * Package-private support helpers for {@code TableNode} layout. @@ -38,73 +30,6 @@ final class TableLayoutSupport { private TableLayoutSupport() { } - /** - * Prepared layout payload attached to {@code TableNode} prepared nodes. - * - *

{@code preparedContents} carries the prepared sub-tree for any - * {@code DocumentTableCell} authored via {@link DocumentTableCell#node(DocumentNode)}; - * keyed by the cell's logical {@code (startRow, startColumn)} and - * empty for tables that contain only plain-text cells.

- */ - record PreparedTableLayout( - ResolvedTableLayout resolvedLayout, - boolean emitBookmark, - Map> preparedContents - ) implements PreparedNodeLayout { - PreparedTableLayout { - preparedContents = preparedContents == null ? Map.of() : Map.copyOf(preparedContents); - } - - /** - * Back-compat 2-arg constructor for callers that don't carry - * composed cell content. Defaults {@code preparedContents} to - * an empty map. - */ - PreparedTableLayout(ResolvedTableLayout resolvedLayout, boolean emitBookmark) { - this(resolvedLayout, emitBookmark, Map.of()); - } - } - - /** - * Logical (row, column) coordinate identifying a cell's starting - * position. Used as the key for the {@code preparedContents} map - * on {@link PreparedTableLayout}. - */ - record CellKey(int row, int column) { - } - - /** - * Resolved table layout (column widths, row heights, resolved cells). - */ - record ResolvedTableLayout( - List columnWidths, - List rowHeights, - List> rows, - double naturalWidth, - double finalWidth, - double totalHeight - ) { - } - - /** - * Logical cell: a single user-authored cell after the cell-grid pre-pass - * has resolved its starting position and colSpan/rowSpan extent. A - * spanning cell appears once at its starting (row, column); the - * positions it occupies in subsequent rows are tracked by the - * occupancy grid built in {@link #buildLogicalRows(TableNode, int)} and - * are skipped when iterating later source rows. {@code source} is the - * original public {@link DocumentTableCell}, retained so the layout - * can detect composed-content cells via - * {@link DocumentTableCell#hasComposedContent()}. {@code sanitizedLines} is - * the cell's text with control characters cleaned, computed once here and - * reused by the width, height and resolve passes instead of re-sanitizing the - * content three times. - */ - private record LogicalCell(int startRow, int startColumn, int colSpan, int rowSpan, - TableCellContent content, DocumentTableCell source, - List sanitizedLines) { - } - /** * Resolves the table layout. Composed-content cells (those authored * via {@link DocumentTableCell#node(DocumentNode)}) require a @@ -114,9 +39,9 @@ private record LogicalCell(int startRow, int startColumn, int colSpan, int rowSp * will still throw if it encounters a composed cell). */ static ResolvedTableLayoutWithContents resolveTableLayout(TableNode node, - PrepareContext prepareContext, - TextMeasurementSystem measurement, - double availableWidth) { + PrepareContext prepareContext, + TextMeasurementSystem measurement, + double availableWidth) { validateRowsExist(node); int columnCount = resolveColumnCount(node); List> logicalRows = buildLogicalRows(node, columnCount); @@ -130,7 +55,7 @@ static ResolvedTableLayoutWithContents resolveTableLayout(TableNode node, double innerAvailableWidth = Math.max(0.0, availableWidth - node.padding().horizontal()); if (finalWidth > innerAvailableWidth + EPS) { throw new IllegalStateException("Table '" + displayName(node) + "' width " + finalWidth - + " exceeds available width " + innerAvailableWidth + "."); + + " exceeds available width " + innerAvailableWidth + "."); } // Prepare composed cell content (cells authored via @@ -229,19 +154,6 @@ static ResolvedTableLayoutWithContents resolveTableLayout(TableNode node, return new ResolvedTableLayoutWithContents(resolved, preparedContents); } - /** - * Bundles the resolved table layout with the prepared composed-cell - * content map so {@link com.demcha.compose.document.layout.NodeDefinitionSupport#prepareTable} - * can attach the map to the {@link PreparedTableLayout}. - */ - record ResolvedTableLayoutWithContents( - ResolvedTableLayout layout, - Map> preparedContents) { - ResolvedTableLayoutWithContents { - preparedContents = preparedContents == null ? Map.of() : Map.copyOf(preparedContents); - } - } - /** * Walks every logical cell, prepares composed children * ({@link DocumentTableCell#hasComposedContent()} == true) against @@ -266,7 +178,7 @@ private static Map> prepareComposedCellContents( if (prepareContext == null) { throw new IllegalStateException( "Table '" + displayName(node) + "' has a composed cell at (" - + rowIndex + ", " + logical.startColumn() + ") but no PrepareContext was supplied."); + + rowIndex + ", " + logical.startColumn() + ") but no PrepareContext was supplied."); } double cellOuterWidth = sumRange(finalWidths, logical.startColumn(), logical.startColumn() + logical.colSpan()); @@ -297,7 +209,7 @@ private static double naturalCellHeight(LogicalCell logical, if (prepared == null) { throw new IllegalStateException( "Composed cell at (" + logical.startRow() + ", " + logical.startColumn() - + ") was not prepared."); + + ") was not prepared."); } Padding padding = style.padding() == null ? Padding.zero() : style.padding(); return prepared.measureResult().height() + padding.vertical(); @@ -497,28 +409,28 @@ private static List> buildLogicalRows(TableNode node, int colu } if (sourceIdx >= source.size()) { throw new IllegalStateException("Row " + rowIndex - + " is missing a cell for column " + col - + " (table has " + columnCount + " columns; source row provides " - + source.size() + " cells, prior rowSpan covers some columns)."); + + " is missing a cell for column " + col + + " (table has " + columnCount + " columns; source row provides " + + source.size() + " cells, prior rowSpan covers some columns)."); } DocumentTableCell cell = source.get(sourceIdx++); if (col + cell.colSpan() > columnCount) { throw new IllegalStateException("Cell at row " + rowIndex - + " column " + col + " has colSpan " + cell.colSpan() - + " but only " + (columnCount - col) + " columns remain."); + + " column " + col + " has colSpan " + cell.colSpan() + + " but only " + (columnCount - col) + " columns remain."); } if (rowIndex + cell.rowSpan() > rowCount) { throw new IllegalStateException("Cell at row " + rowIndex - + " column " + col + " has rowSpan " + cell.rowSpan() - + " but only " + (rowCount - rowIndex) + " rows remain."); + + " column " + col + " has rowSpan " + cell.rowSpan() + + " but only " + (rowCount - rowIndex) + " rows remain."); } for (int r = rowIndex; r < rowIndex + cell.rowSpan(); r++) { for (int c = col; c < col + cell.colSpan(); c++) { if (occupied[r][c]) { throw new IllegalStateException("Cell at row " + rowIndex - + " column " + col + " (colSpan=" + cell.colSpan() - + ", rowSpan=" + cell.rowSpan() - + ") overlaps an already-spanned position (" + r + ", " + c + ")."); + + " column " + col + " (colSpan=" + cell.colSpan() + + ", rowSpan=" + cell.rowSpan() + + ") overlaps an already-spanned position (" + r + ", " + c + ")."); } occupied[r][c] = true; } @@ -530,9 +442,9 @@ private static List> buildLogicalRows(TableNode node, int colu } if (sourceIdx < source.size()) { throw new IllegalStateException("Row " + rowIndex - + " has " + (source.size() - sourceIdx) + " extra source cell(s) " - + "after the grid was already filled — column slots are accounted for " - + "by colSpan plus rowSpan from earlier rows."); + + " has " + (source.size() - sourceIdx) + " extra source cell(s) " + + "after the grid was already filled — column slots are accounted for " + + "by colSpan plus rowSpan from earlier rows."); } result.add(List.copyOf(logical)); } @@ -595,7 +507,7 @@ private static double[] resolveNaturalColumnWidths(TableNode node, if (spec.isFixed()) { if (spec.requiredFixedWidth() + EPS < singleCellRequired[columnIndex]) { throw new IllegalStateException("Fixed column " + columnIndex + " width " + spec.requiredFixedWidth() - + " is smaller than required natural width " + singleCellRequired[columnIndex] + "."); + + " is smaller than required natural width " + singleCellRequired[columnIndex] + "."); } widths[columnIndex] = spec.requiredFixedWidth(); } else { @@ -637,8 +549,8 @@ private static void distributeDeficit(double[] widths, } if (autoColumns.isEmpty()) { throw new IllegalStateException("Spanned cell at row " + rowIndex + " over " + colSpan - + " fixed columns starting at " + startCol + " requires extra width " + deficit - + " but all spanned columns are fixed."); + + " fixed columns starting at " + startCol + " requires extra width " + deficit + + " but all spanned columns are fixed."); } double share = deficit / autoColumns.size(); for (int col : autoColumns) { @@ -656,7 +568,7 @@ private static double[] resolveFinalColumnWidths(TableNode node, } if (node.width() + EPS < naturalWidth) { throw new IllegalStateException("Requested table width " + node.width() - + " is smaller than natural width " + naturalWidth + "."); + + " is smaller than natural width " + naturalWidth + "."); } double extra = node.width() - naturalWidth; @@ -700,8 +612,8 @@ private static double cellNaturalHeight(List sanitizedLines, Padding padding = style.padding() == null ? Padding.zero() : style.padding(); int lineCount = Math.max(1, sanitizedLines.size()); return (lineCount * measurement.lineHeight(style.textStyle())) - + ((lineCount - 1) * tableCellLineSpacing(style)) - + padding.vertical(); + + ((lineCount - 1) * tableCellLineSpacing(style)) + + padding.vertical(); } private static double tableCellLineSpacing(TableCellLayoutStyle style) { @@ -738,11 +650,6 @@ private static void validateRowsExist(TableNode node) { } } - // Note: row colSpan-sum validation is no longer a separate pass — the - // occupancy-grid algorithm in buildLogicalRows enforces both - // colSpan/rowSpan bounds and per-row coverage with precise diagnostics - // (missing cell, extra cell, overlap, out-of-bounds span). - private static EnumSet borderSides(TableCellLayoutStyle[][] stylesGrid, int rowIndex, int startCol, @@ -808,6 +715,11 @@ private static boolean ownsTopBoundary(TableCellLayoutStyle[][] stylesGrid, return true; } + // Note: row colSpan-sum validation is no longer a separate pass — the + // occupancy-grid algorithm in buildLogicalRows enforces both + // colSpan/rowSpan bounds and per-row coverage with precise diagnostics + // (missing cell, extra cell, overlap, out-of-bounds span). + private static boolean ownsLeftBoundary(TableCellLayoutStyle[][] stylesGrid, int rowIndex, int startCol) { @@ -867,4 +779,84 @@ private static String displayName(DocumentNode node) { } return node.name(); } + + /** + * Prepared layout payload attached to {@code TableNode} prepared nodes. + * + *

{@code preparedContents} carries the prepared sub-tree for any + * {@code DocumentTableCell} authored via {@link DocumentTableCell#node(DocumentNode)}; + * keyed by the cell's logical {@code (startRow, startColumn)} and + * empty for tables that contain only plain-text cells.

+ */ + record PreparedTableLayout( + ResolvedTableLayout resolvedLayout, + boolean emitBookmark, + Map> preparedContents + ) implements PreparedNodeLayout { + PreparedTableLayout { + preparedContents = preparedContents == null ? Map.of() : Map.copyOf(preparedContents); + } + + /** + * Back-compat 2-arg constructor for callers that don't carry + * composed cell content. Defaults {@code preparedContents} to + * an empty map. + */ + PreparedTableLayout(ResolvedTableLayout resolvedLayout, boolean emitBookmark) { + this(resolvedLayout, emitBookmark, Map.of()); + } + } + + /** + * Logical (row, column) coordinate identifying a cell's starting + * position. Used as the key for the {@code preparedContents} map + * on {@link PreparedTableLayout}. + */ + record CellKey(int row, int column) { + } + + /** + * Resolved table layout (column widths, row heights, resolved cells). + */ + record ResolvedTableLayout( + List columnWidths, + List rowHeights, + List> rows, + double naturalWidth, + double finalWidth, + double totalHeight + ) { + } + + /** + * Logical cell: a single user-authored cell after the cell-grid pre-pass + * has resolved its starting position and colSpan/rowSpan extent. A + * spanning cell appears once at its starting (row, column); the + * positions it occupies in subsequent rows are tracked by the + * occupancy grid built in {@link #buildLogicalRows(TableNode, int)} and + * are skipped when iterating later source rows. {@code source} is the + * original public {@link DocumentTableCell}, retained so the layout + * can detect composed-content cells via + * {@link DocumentTableCell#hasComposedContent()}. {@code sanitizedLines} is + * the cell's text with control characters cleaned, computed once here and + * reused by the width, height and resolve passes instead of re-sanitizing the + * content three times. + */ + private record LogicalCell(int startRow, int startColumn, int colSpan, int rowSpan, + TableCellContent content, DocumentTableCell source, + List sanitizedLines) { + } + + /** + * Bundles the resolved table layout with the prepared composed-cell + * content map so {@link com.demcha.compose.document.layout.NodeDefinitionSupport#prepareTable} + * can attach the map to the {@link PreparedTableLayout}. + */ + record ResolvedTableLayoutWithContents( + ResolvedTableLayout layout, + Map> preparedContents) { + ResolvedTableLayoutWithContents { + preparedContents = preparedContents == null ? Map.of() : Map.copyOf(preparedContents); + } + } } diff --git a/src/main/java/com/demcha/compose/document/layout/TextFlowSupport.java b/src/main/java/com/demcha/compose/document/layout/TextFlowSupport.java index 7155f88f7..8ec5aa7a5 100644 --- a/src/main/java/com/demcha/compose/document/layout/TextFlowSupport.java +++ b/src/main/java/com/demcha/compose/document/layout/TextFlowSupport.java @@ -1,28 +1,7 @@ package com.demcha.compose.document.layout; -import com.demcha.compose.document.layout.payloads.ParagraphShapeSpan; -import com.demcha.compose.document.layout.payloads.ResolvedShapeLayer; -import com.demcha.compose.document.layout.payloads.ParagraphFragmentPayload; -import com.demcha.compose.document.layout.payloads.ParagraphImageSpan; -import com.demcha.compose.document.layout.payloads.ParagraphLine; -import com.demcha.compose.document.layout.payloads.ParagraphSpan; -import com.demcha.compose.document.layout.payloads.ParagraphTextSpan; -import com.demcha.compose.document.layout.payloads.PreparedListItemLayout; -import com.demcha.compose.document.layout.payloads.PreparedListLayout; -import com.demcha.compose.document.layout.payloads.PreparedParagraphLayout; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.InlineShapeRun; -import com.demcha.compose.document.node.ShapeLayer; -import com.demcha.compose.document.node.InlineImageAlignment; -import com.demcha.compose.document.node.InlineImageRun; -import com.demcha.compose.document.node.InlineRun; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ListItem; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.node.TextVerticalAlign; +import com.demcha.compose.document.layout.payloads.*; +import com.demcha.compose.document.node.*; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextAutoSize; import com.demcha.compose.document.style.DocumentTextIndent; @@ -40,11 +19,7 @@ import java.util.List; import java.util.Objects; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toImageData; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toIndentStrategy; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toPadding; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toStroke; -import static com.demcha.compose.document.layout.DocumentNodeAdapters.toTextStyle; +import static com.demcha.compose.document.layout.DocumentNodeAdapters.*; import static com.demcha.compose.document.layout.NodeDefinitionSupport.EPS; /** @@ -58,19 +33,29 @@ * @author Artem Demchyshyn */ public final class TextFlowSupport { - private TextFlowSupport() { - } + /** + * Indent unit added per nesting depth in a nested list. Two + * non-breaking spaces visually match two regular spaces but are + * preserved by paragraph wrapping (which strips leading + * {@link Character#isWhitespace whitespace} from the first token + * of each line). Switching to NBSP keeps depth indentation intact + * without rewriting the wrap pipeline. + */ + private static final String NESTED_LIST_INDENT_UNIT = "  "; // ------------------------------------------------------------------ // Paragraph entry points // ------------------------------------------------------------------ + private TextFlowSupport() { + } + /** * Measures a paragraph node and wraps it into a prepared leaf carrying its * visual line layout. * - * @param node paragraph node to prepare - * @param ctx prepare-phase context + * @param node paragraph node to prepare + * @param ctx prepare-phase context * @param constraints box constraints for measurement * @return prepared paragraph node with its line layout */ @@ -94,7 +79,7 @@ public static PreparedNode prepareParagraph(ParagraphNode node, * remaining height. * * @param prepared prepared paragraph node - * @param request split request carrying the remaining height + * @param request split request carrying the remaining height * @return the head/tail split result */ public static PreparedSplitResult splitParagraph(PreparedNode prepared, @@ -120,10 +105,14 @@ public static PreparedSplitResult splitParagraph(PreparedNode(head, tail); } + // ------------------------------------------------------------------ + // List entry points + // ------------------------------------------------------------------ + /** * Emits the render fragment for a prepared paragraph. * - * @param prepared prepared paragraph node + * @param prepared prepared paragraph node * @param placement resolved fragment placement * @return renderer-facing paragraph fragments */ @@ -153,16 +142,12 @@ public static List emitParagraphFragments(PreparedNode prepareList(ListNode node, layout); } - /** - * Indent unit added per nesting depth in a nested list. Two - * non-breaking spaces visually match two regular spaces but are - * preserved by paragraph wrapping (which strips leading - * {@link Character#isWhitespace whitespace} from the first token - * of each line). Switching to NBSP keeps depth indentation intact - * without rewriting the wrap pipeline. - */ - private static final String NESTED_LIST_INDENT_UNIT = "  "; - /** * Synthesizes a flat {@link ListNode} from a nested one by walking * the tree depth-first and prefixing each label with @@ -254,7 +229,7 @@ private static ListMarker defaultMarkerForDepth(int depth) { * splitting the first item's lines when no whole item fits. * * @param prepared prepared list node - * @param request split request carrying the remaining height + * @param request split request carrying the remaining height * @return the head/tail split result */ public static PreparedSplitResult splitList(PreparedNode prepared, @@ -318,7 +293,7 @@ public static PreparedSplitResult splitList(PreparedNode pre * Emits one paragraph fragment per list item so items paginate * independently. * - * @param prepared prepared list node + * @param prepared prepared list node * @param placement resolved fragment placement * @return renderer-facing per-item fragments */ @@ -506,7 +481,7 @@ private static PreparedListItemLayout sliceListItem(PreparedListItemLayout item, .max() .orElse(0.0); double totalHeight = source.lineHeight() * lines.size() - + Math.max(0, lines.size() - 1) * source.lineGap(); + + Math.max(0, lines.size() - 1) * source.lineGap(); PreparedParagraphLayout layout = new PreparedParagraphLayout( logicalLines, lines, @@ -641,9 +616,9 @@ private static boolean paragraphFitsSingleLine(ParagraphNode node, } private static PreparedParagraphLayout prepareParagraphLayout(ParagraphNode node, - double innerWidth, - TextMeasurementSystem measurement, - boolean markdownEnabled) { + double innerWidth, + TextMeasurementSystem measurement, + boolean markdownEnabled) { List logicalLines = sanitizeLogicalLines(node.text()); boolean useMarkdownLayout = markdownEnabled && logicalLines.stream().anyMatch(TextFlowSupport::containsMarkdownSyntax); TextStyle textStyle = node.autoSize() != null @@ -653,33 +628,33 @@ private static PreparedParagraphLayout prepareParagraphLayout(ParagraphNode node TextMeasurementSystem.LineMetrics lineMetrics = measurement.lineMetrics(textStyle); List visualLines = !node.inlineRuns().isEmpty() ? wrapInlineParagraph( - node.inlineRuns(), - textStyle, - lineMetrics, - Math.max(0.0, innerWidth), - node.bulletOffset(), - indentStrategy, - measurement) + node.inlineRuns(), + textStyle, + lineMetrics, + Math.max(0.0, innerWidth), + node.bulletOffset(), + indentStrategy, + measurement) : useMarkdownLayout - ? wrapMarkdownParagraph( + ? wrapMarkdownParagraph( + logicalLines, + textStyle, + lineMetrics, + Math.max(0.0, innerWidth), + node.bulletOffset(), + indentStrategy, + measurement) + : toParagraphLines( + wrapParagraph( logicalLines, textStyle, - lineMetrics, Math.max(0.0, innerWidth), node.bulletOffset(), indentStrategy, - measurement) - : toParagraphLines( - wrapParagraph( - logicalLines, - textStyle, - Math.max(0.0, innerWidth), - node.bulletOffset(), - indentStrategy, - measurement), - textStyle, - lineMetrics, - measurement); + measurement), + textStyle, + lineMetrics, + measurement); if (visualLines.isEmpty()) { visualLines = List.of(emptyParagraphLine(lineMetrics)); } @@ -1046,8 +1021,8 @@ private static boolean containsMarkdownSyntax(String value) { return false; } return value.indexOf('*') >= 0 - || value.indexOf('_') >= 0 - || value.indexOf('`') >= 0; + || value.indexOf('_') >= 0 + || value.indexOf('`') >= 0; } private static List wrapMarkdownParagraph(List logicalLines, @@ -1418,7 +1393,7 @@ private static List trimTrailingWhitespaceTokens(List lines, double lineGap, do // Inline tokens + indent spec // ------------------------------------------------------------------ + private sealed interface InlineLayoutToken permits InlineTextToken, InlineImageToken, InlineShapeToken { + double width(); + } + private record ParagraphIndentSpec(String firstLinePrefix, String continuationPrefix) { private static ParagraphIndentSpec from(String bulletOffset, - TextStyle style, - TextMeasurementSystem measurement) { + TextStyle style, + TextMeasurementSystem measurement) { String raw = bulletOffset == null ? "" : bulletOffset; boolean hasVisibleChars = raw.chars().anyMatch(ch -> !Character.isWhitespace(ch)); if (hasVisibleChars) { @@ -1613,10 +1592,6 @@ private static ParagraphIndentSpec from(String bulletOffset, } } - private sealed interface InlineLayoutToken permits InlineTextToken, InlineImageToken, InlineShapeToken { - double width(); - } - private record InlineTextToken( String text, TextStyle textStyle, diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/BarcodeDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/BarcodeDefinition.java index 7f87e9949..899f6e98e 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/BarcodeDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/BarcodeDefinition.java @@ -1,22 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.BarcodeFragmentPayload; import com.demcha.compose.document.node.BarcodeNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.EPS; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toBarcodeData; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.wrapAtomicWithTransform; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link BarcodeNode}: a fixed-size atomic barcode or QR diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/CanvasLayerDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/CanvasLayerDefinition.java index 697a451f4..8fad5b198 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/CanvasLayerDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/CanvasLayerDefinition.java @@ -1,15 +1,6 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.CompositeLayoutSpec; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.PreparedStackLayout; import com.demcha.compose.document.node.CanvasChild; import com.demcha.compose.document.node.CanvasLayerNode; diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/ChartDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/ChartDefinition.java index e731d4342..4049258f0 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/ChartDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/ChartDefinition.java @@ -1,22 +1,7 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.chart.ChartDefaults; -import com.demcha.compose.document.chart.ChartLayoutResolver; -import com.demcha.compose.document.chart.ChartPrimitive; -import com.demcha.compose.document.chart.ChartSpec; -import com.demcha.compose.document.chart.ChartStyle; -import com.demcha.compose.document.chart.ChartTheme; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.ChartTextMetricsSupport; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; -import com.demcha.compose.document.layout.PreparedNodeLayout; +import com.demcha.compose.document.chart.*; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.ChartNode; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.engine.components.style.Margin; @@ -59,7 +44,9 @@ */ public final class ChartDefinition implements NodeDefinition { - /** Creates the chart layout definition. */ + /** + * Creates the chart layout definition. + */ public ChartDefinition() { } @@ -158,7 +145,7 @@ public record PreparedChartLayout(List primitives) implements /** * One prepared primitive child plus its resolver-assigned placement. * - * @param prepared prepared child node + * @param prepared prepared child node * @param primitive the resolver primitive (node + bottom-up box) */ public record PreparedPrimitive(PreparedNode prepared, ChartPrimitive primitive) { diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/ContainerDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/ContainerDefinition.java index b77ea5c7e..1d9c218d2 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/ContainerDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/ContainerDefinition.java @@ -1,24 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.CompositeLayoutSpec; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.ContainerNode; import com.demcha.compose.document.node.DocumentNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.emitDecorationFragment; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.measureComposite; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toPadding; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toSideBorders; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toStroke; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link ContainerNode}: a vertical atomic composite diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/EllipseDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/EllipseDefinition.java index 568335c40..4e86a11bd 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/EllipseDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/EllipseDefinition.java @@ -1,22 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.EllipseFragmentPayload; import com.demcha.compose.document.node.EllipseNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.EPS; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toStroke; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.wrapAtomicWithTransform; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link EllipseNode}: a fixed-size atomic ellipse or diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/ImageDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/ImageDefinition.java index 07097565d..e13502f78 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/ImageDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/ImageDefinition.java @@ -1,24 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.NodeDefinitionSupport.ImageDimensions; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.ImageFragmentPayload; import com.demcha.compose.document.node.ImageNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.EPS; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.resolveImageDimensions; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toImageData; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.wrapAtomicWithTransform; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link ImageNode}: resolves image dimensions from diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/LayerStackDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/LayerStackDefinition.java index 072c99173..36e358e4d 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/LayerStackDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/LayerStackDefinition.java @@ -1,14 +1,6 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.CompositeLayoutSpec; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.PreparedStackLayout; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.LayerAlign; diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/LineDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/LineDefinition.java index 8bfe42f63..996e8fec9 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/LineDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/LineDefinition.java @@ -1,22 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.LineFragmentPayload; import com.demcha.compose.document.node.LineNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.EPS; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toStroke; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.wrapAtomicWithTransform; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link LineNode}: a fixed-size atomic line fragment diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/ListDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/ListDefinition.java index 68b4bbea3..e33738302 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/ListDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/ListDefinition.java @@ -1,22 +1,11 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; -import com.demcha.compose.document.layout.PreparedSplitResult; -import com.demcha.compose.document.layout.SplitRequest; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.ListNode; import java.util.List; -import static com.demcha.compose.document.layout.TextFlowSupport.emitListFragments; -import static com.demcha.compose.document.layout.TextFlowSupport.prepareList; -import static com.demcha.compose.document.layout.TextFlowSupport.splitList; +import static com.demcha.compose.document.layout.TextFlowSupport.*; /** * Layout definition for {@link ListNode}: lays out list items as a column of diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/PageBreakDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/PageBreakDefinition.java index 683205a18..f2dea1f61 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/PageBreakDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/PageBreakDefinition.java @@ -1,14 +1,6 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.PageBreakNode; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/ParagraphDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/ParagraphDefinition.java index eb60a8452..c7c1ffc5b 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/ParagraphDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/ParagraphDefinition.java @@ -1,22 +1,11 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; -import com.demcha.compose.document.layout.PreparedSplitResult; -import com.demcha.compose.document.layout.SplitRequest; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.ParagraphNode; import java.util.List; -import static com.demcha.compose.document.layout.TextFlowSupport.emitParagraphFragments; -import static com.demcha.compose.document.layout.TextFlowSupport.prepareParagraph; -import static com.demcha.compose.document.layout.TextFlowSupport.splitParagraph; +import static com.demcha.compose.document.layout.TextFlowSupport.*; /** * Layout definition for {@link ParagraphNode}: wraps text into visual lines, diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/PolygonDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/PolygonDefinition.java index ab7cdd79e..0b86b78ae 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/PolygonDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/PolygonDefinition.java @@ -1,14 +1,6 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.PolygonFragmentPayload; import com.demcha.compose.document.node.PolygonNode; @@ -26,7 +18,9 @@ */ public final class PolygonDefinition implements NodeDefinition { - /** Creates the polygon layout definition. */ + /** + * Creates the polygon layout definition. + */ public PolygonDefinition() { } diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/RowDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/RowDefinition.java index f938aed07..4b416b75e 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/RowDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/RowDefinition.java @@ -1,24 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.CompositeLayoutSpec; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.RowNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.emitDecorationFragment; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.measureRow; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toPadding; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toSideBorders; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toStroke; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link RowNode}: a horizontal atomic composite whose diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/SectionDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/SectionDefinition.java index 9180ae8fc..c3b6f5736 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/SectionDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/SectionDefinition.java @@ -1,24 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.CompositeLayoutSpec; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.SectionNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.emitDecorationFragment; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.measureComposite; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toPadding; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toSideBorders; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toStroke; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link SectionNode}: a vertical atomic composite with diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/ShapeContainerDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/ShapeContainerDefinition.java index 6468fddba..fd831594f 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/ShapeContainerDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/ShapeContainerDefinition.java @@ -1,23 +1,7 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.CompositeLayoutSpec; -import com.demcha.compose.document.layout.payloads.EllipseFragmentPayload; -import com.demcha.compose.document.layout.payloads.PolygonFragmentPayload; -import com.demcha.compose.document.layout.payloads.PreparedStackLayout; -import com.demcha.compose.document.layout.payloads.ShapeClipBeginPayload; -import com.demcha.compose.document.layout.payloads.ShapeFragmentPayload; -import com.demcha.compose.document.layout.payloads.ShapeClipEndPayload; -import com.demcha.compose.document.layout.payloads.TransformBeginPayload; -import com.demcha.compose.document.layout.payloads.TransformEndPayload; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; +import com.demcha.compose.document.layout.payloads.*; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.LayerAlign; import com.demcha.compose.document.node.LayerStackNode; @@ -27,13 +11,11 @@ import com.demcha.compose.engine.components.content.shape.Stroke; import com.demcha.compose.engine.components.style.Padding; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.EPS; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toPadding; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toStroke; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link ShapeContainerNode}: an atomic shape-backed diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/ShapeDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/ShapeDefinition.java index 5b4c91491..10d798828 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/ShapeDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/ShapeDefinition.java @@ -1,22 +1,12 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.layout.payloads.ShapeFragmentPayload; import com.demcha.compose.document.node.ShapeNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.EPS; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.toStroke; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.wrapAtomicWithTransform; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link ShapeNode}: a fixed-size atomic rectangle shape diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/SpacerDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/SpacerDefinition.java index 2e7096d77..ad650a6bd 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/SpacerDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/SpacerDefinition.java @@ -1,14 +1,6 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.MeasureResult; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.SpacerNode; import java.util.List; diff --git a/src/main/java/com/demcha/compose/document/layout/definitions/TableDefinition.java b/src/main/java/com/demcha/compose/document/layout/definitions/TableDefinition.java index 5b02d2d69..31fcb6bb8 100644 --- a/src/main/java/com/demcha/compose/document/layout/definitions/TableDefinition.java +++ b/src/main/java/com/demcha/compose/document/layout/definitions/TableDefinition.java @@ -1,22 +1,11 @@ package com.demcha.compose.document.layout.definitions; -import com.demcha.compose.document.layout.BoxConstraints; -import com.demcha.compose.document.layout.FragmentContext; -import com.demcha.compose.document.layout.FragmentPlacement; -import com.demcha.compose.document.layout.LayoutFragment; -import com.demcha.compose.document.layout.NodeDefinition; -import com.demcha.compose.document.layout.PaginationPolicy; -import com.demcha.compose.document.layout.PrepareContext; -import com.demcha.compose.document.layout.PreparedNode; -import com.demcha.compose.document.layout.PreparedSplitResult; -import com.demcha.compose.document.layout.SplitRequest; +import com.demcha.compose.document.layout.*; import com.demcha.compose.document.node.TableNode; import java.util.List; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.emitTableFragments; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.prepareTable; -import static com.demcha.compose.document.layout.NodeDefinitionSupport.splitTable; +import static com.demcha.compose.document.layout.NodeDefinitionSupport.*; /** * Layout definition for {@link TableNode}: resolves table geometry through diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/BarcodeFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/BarcodeFragmentPayload.java index 48bf6ab62..14bc0d745 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/BarcodeFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/BarcodeFragmentPayload.java @@ -7,8 +7,8 @@ /** * PDF payload for a resolved barcode fragment. * - * @param barcodeData encoded barcode payload - * @param linkOptions optional fragment-level link metadata + * @param barcodeData encoded barcode payload + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata */ public record BarcodeFragmentPayload( diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/EllipseFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/EllipseFragmentPayload.java index 56d5d57f7..724dd57f7 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/EllipseFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/EllipseFragmentPayload.java @@ -4,14 +4,14 @@ import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.engine.components.content.shape.Stroke; -import java.awt.Color; +import java.awt.*; /** * PDF payload for a resolved ellipse or circle fragment. * - * @param fillColor optional fill color - * @param stroke optional stroke - * @param linkOptions optional fragment-level link metadata + * @param fillColor optional fill color + * @param stroke optional stroke + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata */ public record EllipseFragmentPayload( diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ImageFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/ImageFragmentPayload.java index a48d839b1..2dcc1d009 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ImageFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ImageFragmentPayload.java @@ -8,9 +8,9 @@ /** * PDF payload for a resolved image fragment. * - * @param imageData image source data - * @param fitMode image fit policy used inside the resolved fragment - * @param linkOptions optional fragment-level link metadata + * @param imageData image source data + * @param fitMode image fit policy used inside the resolved fragment + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata */ public record ImageFragmentPayload( @@ -26,3 +26,4 @@ public record ImageFragmentPayload( fitMode = fitMode == null ? DocumentImageFitMode.STRETCH : fitMode; } } + diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/LineFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/LineFragmentPayload.java index 333f1b341..82ab56f2a 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/LineFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/LineFragmentPayload.java @@ -8,14 +8,14 @@ /** * PDF payload for a resolved line fragment. * - * @param stroke line stroke - * @param startX line start x offset inside the fragment - * @param startY line start y offset inside the fragment - * @param endX line end x offset inside the fragment - * @param endY line end y offset inside the fragment - * @param linkOptions optional fragment-level link metadata + * @param stroke line stroke + * @param startX line start x offset inside the fragment + * @param startY line start y offset inside the fragment + * @param endX line end x offset inside the fragment + * @param endY line end y offset inside the fragment + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata - * @param dashPattern dash pattern for the stroke; {@link DocumentDashPattern#NONE} is solid + * @param dashPattern dash pattern for the stroke; {@link DocumentDashPattern#NONE} is solid */ public record LineFragmentPayload( Stroke stroke, @@ -38,12 +38,12 @@ public record LineFragmentPayload( /** * Backward-compatible constructor for a solid line fragment. * - * @param stroke line stroke - * @param startX line start x offset inside the fragment - * @param startY line start y offset inside the fragment - * @param endX line end x offset inside the fragment - * @param endY line end y offset inside the fragment - * @param linkOptions optional fragment-level link metadata + * @param stroke line stroke + * @param startX line start x offset inside the fragment + * @param startY line start y offset inside the fragment + * @param endX line end x offset inside the fragment + * @param endY line end y offset inside the fragment + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata */ public LineFragmentPayload(Stroke stroke, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphFragmentPayload.java index 4df155eb7..629387d27 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphFragmentPayload.java @@ -12,16 +12,16 @@ /** * PDF payload for a resolved paragraph fragment. * - * @param textStyle base text style for the fragment - * @param align horizontal text alignment - * @param padding fragment padding - * @param lineHeight resolved line height - * @param lineGap extra spacing between lines - * @param baselineOffset offset from line bottom to baseline - * @param lines measured lines contained by the fragment - * @param linkOptions optional fragment-level link metadata + * @param textStyle base text style for the fragment + * @param align horizontal text alignment + * @param padding fragment padding + * @param lineHeight resolved line height + * @param lineGap extra spacing between lines + * @param baselineOffset offset from line bottom to baseline + * @param lines measured lines contained by the fragment + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata - * @param verticalAlign vertical seating of the text within its line box + * @param verticalAlign vertical seating of the text within its line box */ public record ParagraphFragmentPayload( TextStyle textStyle, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphImageSpan.java b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphImageSpan.java index 1911fe3db..b48c15453 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphImageSpan.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphImageSpan.java @@ -9,12 +9,12 @@ /** * Measured inline image span inside a paragraph line. * - * @param imageData engine image payload, ready for the PDF backend - * @param width target width in points - * @param height target height in points - * @param alignment vertical alignment relative to the surrounding text + * @param imageData engine image payload, ready for the PDF backend + * @param width target width in points + * @param height target height in points + * @param alignment vertical alignment relative to the surrounding text * @param baselineOffset extra vertical offset in points; positive moves up - * @param linkOptions optional link metadata + * @param linkOptions optional link metadata */ public record ParagraphImageSpan( ImageData imageData, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphLine.java b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphLine.java index d67a6d006..809f144aa 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphLine.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphLine.java @@ -5,17 +5,17 @@ /** * One measured paragraph line emitted to the PDF backend. * - * @param text line text used for diagnostics and simple rendering paths - * @param width measured line width - * @param lineHeight resolved line height (max of text and image heights) - * @param textLineHeight font-line-height for the dominant text style on - * this line; equals {@code lineHeight} when no - * inline image enlarges the line - * @param textAscent ascent of the dominant text style on this line; used - * to position image spans relative to the baseline + * @param text line text used for diagnostics and simple rendering paths + * @param width measured line width + * @param lineHeight resolved line height (max of text and image heights) + * @param textLineHeight font-line-height for the dominant text style on + * this line; equals {@code lineHeight} when no + * inline image enlarges the line + * @param textAscent ascent of the dominant text style on this line; used + * to position image spans relative to the baseline * @param baselineOffsetFromBottom distance from line bottom to the text * baseline - * @param spans measured styled spans in source order + * @param spans measured styled spans in source order */ public record ParagraphLine( String text, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphShapeSpan.java b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphShapeSpan.java index 94c4b4207..e0872d482 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphShapeSpan.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphShapeSpan.java @@ -11,12 +11,12 @@ * bounding box, so composite figures (e.g. a checkbox: box + checkmark) place * on the text baseline as one unit. * - * @param layers resolved paint layers, back-to-front - * @param width bounding width in points - * @param height bounding height in points - * @param alignment vertical alignment relative to the surrounding text + * @param layers resolved paint layers, back-to-front + * @param width bounding width in points + * @param height bounding height in points + * @param alignment vertical alignment relative to the surrounding text * @param baselineOffset extra vertical offset in points; positive moves up - * @param linkOptions optional link metadata + * @param linkOptions optional link metadata */ public record ParagraphShapeSpan( List layers, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphSpan.java b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphSpan.java index 095376958..b40761903 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphSpan.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphSpan.java @@ -26,7 +26,7 @@ public sealed interface ParagraphSpan permits ParagraphTextSpan, ParagraphImageS * Height this span contributes to its line. * * @return effective height contribution for line metrics (font line - * height for text spans, image height for image spans) + * height for text spans, image height for image spans) */ double height(); } diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphTextSpan.java b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphTextSpan.java index 4cbee69ca..1fc63812e 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphTextSpan.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ParagraphTextSpan.java @@ -6,10 +6,10 @@ /** * Measured text span inside a paragraph line. * - * @param text visible text for the span - * @param textStyle resolved text style - * @param width measured span width - * @param height font line height contribution + * @param text visible text for the span + * @param textStyle resolved text style + * @param width measured span width + * @param height font line height contribution * @param linkOptions optional link metadata for the span */ public record ParagraphTextSpan( @@ -30,10 +30,10 @@ public record ParagraphTextSpan( /** * Convenience constructor without link metadata. * - * @param text visible text for the span + * @param text visible text for the span * @param textStyle resolved text style - * @param width measured span width - * @param height font line height contribution + * @param width measured span width + * @param height font line height contribution */ public ParagraphTextSpan(String text, TextStyle textStyle, double width, double height) { this(text, textStyle, width, height, null); diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/PolygonFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/PolygonFragmentPayload.java index eb5ff1c72..2f1d4b1cf 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/PolygonFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/PolygonFragmentPayload.java @@ -5,7 +5,7 @@ import com.demcha.compose.document.style.ShapePoint; import com.demcha.compose.engine.components.content.shape.Stroke; -import java.awt.Color; +import java.awt.*; import java.util.List; import java.util.Objects; @@ -14,10 +14,10 @@ * vertex ring). The normalized vertices are scaled to the placed fragment's * size by the render handler. * - * @param points normalized vertex ring (at least three), in draw order - * @param fillColor optional fill color - * @param stroke optional stroke - * @param linkOptions optional fragment-level link metadata + * @param points normalized vertex ring (at least three), in draw order + * @param fillColor optional fill color + * @param stroke optional stroke + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata */ public record PolygonFragmentPayload( diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListItemLayout.java b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListItemLayout.java index bfb3d81e9..00cc1afe0 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListItemLayout.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListItemLayout.java @@ -7,7 +7,7 @@ * Wraps the item's text alongside the prepared paragraph layout that * the list definition uses to split items across pages. * - * @param text raw item text + * @param text raw item text * @param paragraphLayout prepared paragraph layout for this item */ public record PreparedListItemLayout( diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListLayout.java b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListLayout.java index 0a9b632f8..2296adcd3 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListLayout.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedListLayout.java @@ -9,9 +9,9 @@ * Aggregates the per-item prepared layouts and the resolved width/height * the list definition uses for the emit pass. * - * @param items per-item prepared layouts - * @param maxLineWidth widest measured line width across items - * @param totalHeight cumulative list height + * @param items per-item prepared layouts + * @param maxLineWidth widest measured line width across items + * @param totalHeight cumulative list height * @param resolvedWidth resolved layout width */ public record PreparedListLayout( diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedParagraphLayout.java b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedParagraphLayout.java index 5c91ed8ac..98b5222c5 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedParagraphLayout.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedParagraphLayout.java @@ -11,15 +11,15 @@ * cumulative measurements computed during the prepare pass; consumed by * the paragraph definition's split + emit paths. * - * @param logicalLines original paragraph lines before wrapping - * @param visualLines wrapped lines that the renderer paints - * @param lineMetrics font line metrics for the dominant text style + * @param logicalLines original paragraph lines before wrapping + * @param visualLines wrapped lines that the renderer paints + * @param lineMetrics font line metrics for the dominant text style * @param baselineOffset baseline offset in points - * @param lineHeight resolved line height - * @param lineGap extra spacing between wrapped lines - * @param maxLineWidth widest measured line width - * @param totalHeight cumulative paragraph height - * @param emitBookmark whether the paragraph should emit a bookmark + * @param lineHeight resolved line height + * @param lineGap extra spacing between wrapped lines + * @param maxLineWidth widest measured line width + * @param totalHeight cumulative paragraph height + * @param emitBookmark whether the paragraph should emit a bookmark */ public record PreparedParagraphLayout( List logicalLines, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedStackLayout.java b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedStackLayout.java index 7ff976ead..17f83aa06 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/PreparedStackLayout.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/PreparedStackLayout.java @@ -17,9 +17,9 @@ * earlier-declared layer with {@code zIndex = 5}.

* * @param alignments per-layer alignments resolved from the source order - * @param offsetsX per-layer horizontal offsets from the alignment anchor - * @param offsetsY per-layer vertical offsets from the alignment anchor - * @param zIndices per-layer render-order keys (defaults are {@code 0}) + * @param offsetsX per-layer horizontal offsets from the alignment anchor + * @param offsetsY per-layer vertical offsets from the alignment anchor + * @param zIndices per-layer render-order keys (defaults are {@code 0}) */ public record PreparedStackLayout( List alignments, @@ -36,12 +36,12 @@ public record PreparedStackLayout( offsetsY = List.copyOf(offsetsY); zIndices = List.copyOf(zIndices); if (offsetsX.size() != alignments.size() - || offsetsY.size() != alignments.size() - || zIndices.size() != alignments.size()) { + || offsetsY.size() != alignments.size() + || zIndices.size() != alignments.size()) { throw new IllegalArgumentException( "PreparedStackLayout: alignments/offsets/zIndices size mismatch (" - + alignments.size() + "/" + offsetsX.size() + "/" - + offsetsY.size() + "/" + zIndices.size() + ")"); + + alignments.size() + "/" + offsetsX.size() + "/" + + offsetsY.size() + "/" + zIndices.size() + ")"); } } @@ -50,8 +50,8 @@ public record PreparedStackLayout( * zeros so layers render in source order. * * @param alignments per-layer alignments - * @param offsetsX per-layer horizontal offsets - * @param offsetsY per-layer vertical offsets + * @param offsetsX per-layer horizontal offsets + * @param offsetsY per-layer vertical offsets */ public PreparedStackLayout(List alignments, List offsetsX, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ResolvedShapeLayer.java b/src/main/java/com/demcha/compose/document/layout/payloads/ResolvedShapeLayer.java index 9142cd91e..c6f4f33df 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ResolvedShapeLayer.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ResolvedShapeLayer.java @@ -3,16 +3,16 @@ import com.demcha.compose.document.style.ShapeOutline; import com.demcha.compose.engine.components.content.shape.Stroke; -import java.awt.Color; +import java.awt.*; /** * One resolved paint layer of a {@link ParagraphShapeSpan}: an outline figure * whose fill colour and stroke are already resolved to AWT / engine primitives, * ready for the PDF backend. * - * @param outline figure geometry + * @param outline figure geometry * @param fillColor optional resolved fill color - * @param stroke optional resolved outline stroke + * @param stroke optional resolved outline stroke */ public record ResolvedShapeLayer(ShapeOutline outline, Color fillColor, Stroke stroke) { } diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ShapeClipBeginPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/ShapeClipBeginPayload.java index 4f090372b..c8603339b 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ShapeClipBeginPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ShapeClipBeginPayload.java @@ -20,11 +20,11 @@ * Backends that cannot express path clipping (e.g. DOCX/POI) skip both * fragments and emit a capability warning instead.

* - * @param outline outline geometry to clip against - * @param policy clip policy chosen for the container; renderers may - * degrade {@link ClipPolicy#CLIP_PATH} to - * {@link ClipPolicy#CLIP_BOUNDS} when path clipping is - * unavailable + * @param outline outline geometry to clip against + * @param policy clip policy chosen for the container; renderers may + * degrade {@link ClipPolicy#CLIP_PATH} to + * {@link ClipPolicy#CLIP_BOUNDS} when path clipping is + * unavailable * @param ownerPath semantic path of the owning container — used by * architecture-guard tests to verify the begin/end * pair balance diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/ShapeFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/ShapeFragmentPayload.java index 28fbfa6d1..acd1b6b5c 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/ShapeFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/ShapeFragmentPayload.java @@ -6,7 +6,7 @@ import com.demcha.compose.document.style.DocumentPaint; import com.demcha.compose.engine.components.content.shape.Stroke; -import java.awt.Color; +import java.awt.*; /** * PDF payload for a resolved shape fragment. @@ -22,13 +22,13 @@ * {@link DocumentPaint.Radial} and backends without shading support fall * back to its {@link DocumentPaint#primaryColor()}.

* - * @param fillColor optional shape fill color - * @param stroke optional shape stroke - * @param cornerRadius per-corner radii in points - * @param linkOptions optional fragment-level link metadata + * @param fillColor optional shape fill color + * @param stroke optional shape stroke + * @param cornerRadius per-corner radii in points + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata - * @param sideBorders optional per-side border strokes - * @param fillPaint optional gradient fill; {@code null} for solid fills + * @param sideBorders optional per-side border strokes + * @param fillPaint optional gradient fill; {@code null} for solid fills */ public record ShapeFragmentPayload( Color fillColor, @@ -51,12 +51,12 @@ public record ShapeFragmentPayload( /** * Backwards-compatible constructor without a gradient fill. * - * @param fillColor optional shape fill color - * @param stroke optional shape stroke - * @param cornerRadius per-corner radii in points - * @param linkOptions optional fragment-level link metadata + * @param fillColor optional shape fill color + * @param stroke optional shape stroke + * @param cornerRadius per-corner radii in points + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata - * @param sideBorders optional per-side border strokes + * @param sideBorders optional per-side border strokes */ public ShapeFragmentPayload(Color fillColor, Stroke stroke, @@ -71,12 +71,12 @@ public ShapeFragmentPayload(Color fillColor, * Backwards-compatible constructor that accepts a single uniform * radius (pre-Phase E.1.1 wiring) and applies it to every corner. * - * @param fillColor optional shape fill color - * @param stroke optional shape stroke - * @param cornerRadius uniform corner radius in points - * @param linkOptions optional fragment-level link metadata + * @param fillColor optional shape fill color + * @param stroke optional shape stroke + * @param cornerRadius uniform corner radius in points + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata - * @param sideBorders optional per-side border strokes + * @param sideBorders optional per-side border strokes */ public ShapeFragmentPayload(Color fillColor, Stroke stroke, @@ -94,10 +94,10 @@ public ShapeFragmentPayload(Color fillColor, /** * Backwards-compatible constructor without per-side borders. * - * @param fillColor optional shape fill color - * @param stroke optional shape stroke - * @param cornerRadius uniform corner radius in points - * @param linkOptions optional fragment-level link metadata + * @param fillColor optional shape fill color + * @param stroke optional shape stroke + * @param cornerRadius uniform corner radius in points + * @param linkOptions optional fragment-level link metadata * @param bookmarkOptions optional fragment-level bookmark metadata */ public ShapeFragmentPayload(Color fillColor, diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/SideBorders.java b/src/main/java/com/demcha/compose/document/layout/payloads/SideBorders.java index f4f6c356d..788b9d650 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/SideBorders.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/SideBorders.java @@ -9,10 +9,10 @@ * side. The renderer treats this record as a request to draw the four lines * separately rather than rely on a single uniform rectangle stroke.

* - * @param top top side stroke, or {@code null} for no border on that side - * @param right right side stroke, or {@code null} for no border on that side + * @param top top side stroke, or {@code null} for no border on that side + * @param right right side stroke, or {@code null} for no border on that side * @param bottom bottom side stroke, or {@code null} for no border on that side - * @param left left side stroke, or {@code null} for no border on that side + * @param left left side stroke, or {@code null} for no border on that side */ public record SideBorders(Stroke top, Stroke right, Stroke bottom, Stroke left) { /** diff --git a/src/main/java/com/demcha/compose/document/layout/payloads/TableRowFragmentPayload.java b/src/main/java/com/demcha/compose/document/layout/payloads/TableRowFragmentPayload.java index a894c1189..684e77c62 100644 --- a/src/main/java/com/demcha/compose/document/layout/payloads/TableRowFragmentPayload.java +++ b/src/main/java/com/demcha/compose/document/layout/payloads/TableRowFragmentPayload.java @@ -9,10 +9,10 @@ /** * PDF payload for one resolved table row fragment. * - * @param cells resolved cells in column order + * @param cells resolved cells in column order * @param startsPageFragment whether this row starts a table page fragment - * @param linkOptions optional fragment-level link metadata - * @param bookmarkOptions optional fragment-level bookmark metadata + * @param linkOptions optional fragment-level link metadata + * @param bookmarkOptions optional fragment-level bookmark metadata */ public record TableRowFragmentPayload( List cells, diff --git a/src/main/java/com/demcha/compose/document/node/BarcodeNode.java b/src/main/java/com/demcha/compose/document/node/BarcodeNode.java index 0d0ddd12e..0f7c1460f 100644 --- a/src/main/java/com/demcha/compose/document/node/BarcodeNode.java +++ b/src/main/java/com/demcha/compose/document/node/BarcodeNode.java @@ -56,12 +56,12 @@ public record BarcodeNode( /** * Backward-compatible convenience constructor without link/bookmark metadata. * - * @param name node name used in snapshots and layout graph paths - * @param barcodeOptions canonical barcode payload - * @param width target rendered width - * @param height target rendered height - * @param padding inner padding - * @param margin outer margin + * @param name node name used in snapshots and layout graph paths + * @param barcodeOptions canonical barcode payload + * @param width target rendered width + * @param height target rendered height + * @param padding inner padding + * @param margin outer margin */ public BarcodeNode(String name, DocumentBarcodeOptions barcodeOptions, diff --git a/src/main/java/com/demcha/compose/document/node/CanvasChild.java b/src/main/java/com/demcha/compose/document/node/CanvasChild.java index ec1195ddd..f28b5c0f5 100644 --- a/src/main/java/com/demcha/compose/document/node/CanvasChild.java +++ b/src/main/java/com/demcha/compose/document/node/CanvasChild.java @@ -15,9 +15,8 @@ * pixel-perfect cover-page elements.

* * @param node child node placed inside the canvas - * @param x offset from the canvas's left edge (points) - * @param y offset from the canvas's top edge (points, positive = down) - * + * @param x offset from the canvas's left edge (points) + * @param y offset from the canvas's top edge (points, positive = down) * @author Artem Demchyshyn */ public record CanvasChild(DocumentNode node, double x, double y) { diff --git a/src/main/java/com/demcha/compose/document/node/CanvasLayerNode.java b/src/main/java/com/demcha/compose/document/node/CanvasLayerNode.java index 3d86098bc..ad8f0e897 100644 --- a/src/main/java/com/demcha/compose/document/node/CanvasLayerNode.java +++ b/src/main/java/com/demcha/compose/document/node/CanvasLayerNode.java @@ -31,16 +31,15 @@ * page. Children must therefore stay short enough to live on a * single page; oversized canvases throw at layout time.

* - * @param name canvas name used in snapshots and layout graph paths - * @param width canvas inner width in points (must be {@code > 0}) - * @param height canvas inner height in points (must be {@code > 0}) + * @param name canvas name used in snapshots and layout graph paths + * @param width canvas inner width in points (must be {@code > 0}) + * @param height canvas inner height in points (must be {@code > 0}) * @param placements per-child {@link CanvasChild} entries (node + position) * @param clipPolicy clipping mode applied to children that overflow * the canvas's bounding box - * @param padding inner padding between the canvas's outer rectangle - * and the placement coordinate space - * @param margin outer margin around the canvas - * + * @param padding inner padding between the canvas's outer rectangle + * and the placement coordinate space + * @param margin outer margin around the canvas * @author Artem Demchyshyn */ public record CanvasLayerNode( diff --git a/src/main/java/com/demcha/compose/document/node/ChartNode.java b/src/main/java/com/demcha/compose/document/node/ChartNode.java index 893bf076b..6e03b880d 100644 --- a/src/main/java/com/demcha/compose/document/node/ChartNode.java +++ b/src/main/java/com/demcha/compose/document/node/ChartNode.java @@ -23,12 +23,11 @@ * it places whole on a page or moves to the next, exactly like an inline image * or a shape container.

* - * @param name optional semantic name for snapshots / diagnostics - * @param spec structural chart description (kind, axes, legend, data) - * @param style visual styling, or {@code null} to inherit the theme entirely - * @param margin outer spacing + * @param name optional semantic name for snapshots / diagnostics + * @param spec structural chart description (kind, axes, legend, data) + * @param style visual styling, or {@code null} to inherit the theme entirely + * @param margin outer spacing * @param padding inner spacing inside the chart box (insets the plot area) - * * @author Artem Demchyshyn * @since 1.8.0 */ @@ -40,7 +39,9 @@ public record ChartNode( DocumentInsets padding ) implements DocumentNode { - /** Normalizes nullable spacing and name. */ + /** + * Normalizes nullable spacing and name. + */ public ChartNode { name = name == null ? "" : name; Objects.requireNonNull(spec, "spec"); diff --git a/src/main/java/com/demcha/compose/document/node/ContainerNode.java b/src/main/java/com/demcha/compose/document/node/ContainerNode.java index 961159645..793e96e69 100644 --- a/src/main/java/com/demcha/compose/document/node/ContainerNode.java +++ b/src/main/java/com/demcha/compose/document/node/ContainerNode.java @@ -1,10 +1,6 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.style.DocumentBorders; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; +import com.demcha.compose.document.style.*; import java.util.List; import java.util.Objects; @@ -12,16 +8,15 @@ /** * Vertical flow semantic container. * - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param spacing vertical spacing between children - * @param padding inner padding - * @param margin outer margin - * @param fillColor optional background fill - * @param stroke optional uniform border stroke + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param spacing vertical spacing between children + * @param padding inner padding + * @param margin outer margin + * @param fillColor optional background fill + * @param stroke optional uniform border stroke * @param cornerRadius optional render-only corner radius - * @param borders optional per-side border strokes overriding the uniform stroke - * + * @param borders optional per-side border strokes overriding the uniform stroke * @author Artem Demchyshyn */ public record ContainerNode( @@ -54,13 +49,13 @@ public record ContainerNode( /** * Creates a vertical flow container without per-side borders. * - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param spacing vertical spacing between children - * @param padding inner padding - * @param margin outer margin - * @param fillColor optional background fill - * @param stroke optional uniform border stroke + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param spacing vertical spacing between children + * @param padding inner padding + * @param margin outer margin + * @param fillColor optional background fill + * @param stroke optional uniform border stroke * @param cornerRadius optional render-only corner radius */ public ContainerNode(String name, @@ -77,13 +72,13 @@ public ContainerNode(String name, /** * Creates a vertical flow container with square corners and no per-side borders. * - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param spacing vertical spacing between children - * @param padding inner padding - * @param margin outer margin + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param spacing vertical spacing between children + * @param padding inner padding + * @param margin outer margin * @param fillColor optional background fill - * @param stroke optional uniform border stroke + * @param stroke optional uniform border stroke */ public ContainerNode(String name, List children, diff --git a/src/main/java/com/demcha/compose/document/node/DocumentBarcodeType.java b/src/main/java/com/demcha/compose/document/node/DocumentBarcodeType.java index 2a297d40b..792fe3f25 100644 --- a/src/main/java/com/demcha/compose/document/node/DocumentBarcodeType.java +++ b/src/main/java/com/demcha/compose/document/node/DocumentBarcodeType.java @@ -6,20 +6,36 @@ * @author Artem Demchyshyn */ public enum DocumentBarcodeType { - /** QR code. */ + /** + * QR code. + */ QR_CODE, - /** Code 128 barcode. */ + /** + * Code 128 barcode. + */ CODE_128, - /** Code 39 barcode. */ + /** + * Code 39 barcode. + */ CODE_39, - /** EAN-13 barcode. */ + /** + * EAN-13 barcode. + */ EAN_13, - /** EAN-8 barcode. */ + /** + * EAN-8 barcode. + */ EAN_8, - /** UPC-A barcode. */ + /** + * UPC-A barcode. + */ UPC_A, - /** PDF417 barcode. */ + /** + * PDF417 barcode. + */ PDF_417, - /** Data Matrix barcode. */ + /** + * Data Matrix barcode. + */ DATA_MATRIX } diff --git a/src/main/java/com/demcha/compose/document/node/EllipseNode.java b/src/main/java/com/demcha/compose/document/node/EllipseNode.java index a7e469aa8..c0783cb87 100644 --- a/src/main/java/com/demcha/compose/document/node/EllipseNode.java +++ b/src/main/java/com/demcha/compose/document/node/EllipseNode.java @@ -8,17 +8,17 @@ /** * Atomic ellipse or circle semantic shape. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved ellipse width - * @param height resolved ellipse height - * @param fillColor optional fill color - * @param stroke optional stroke descriptor - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved ellipse width + * @param height resolved ellipse height + * @param fillColor optional fill color + * @param stroke optional stroke descriptor + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param transform render-time affine transform; defaults to - * {@link DocumentTransform#NONE}. + * @param padding inner padding + * @param margin outer margin + * @param transform render-time affine transform; defaults to + * {@link DocumentTransform#NONE}. * @author Artem Demchyshyn */ public record EllipseNode( @@ -53,15 +53,15 @@ public record EllipseNode( * Backward-compatible convenience constructor without transform — defaults * to {@link DocumentTransform#NONE}. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved ellipse width - * @param height resolved ellipse height - * @param fillColor optional fill color - * @param stroke optional stroke descriptor - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved ellipse width + * @param height resolved ellipse height + * @param fillColor optional fill color + * @param stroke optional stroke descriptor + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public EllipseNode(String name, double width, diff --git a/src/main/java/com/demcha/compose/document/node/ImageNode.java b/src/main/java/com/demcha/compose/document/node/ImageNode.java index b5c055075..d8a3556f7 100644 --- a/src/main/java/com/demcha/compose/document/node/ImageNode.java +++ b/src/main/java/com/demcha/compose/document/node/ImageNode.java @@ -10,19 +10,18 @@ /** * Atomic semantic image node. * - * @param name node name used in snapshots and layout graph paths - * @param imageData semantic image payload - * @param width optional target width - * @param height optional target height - * @param scale optional uniform scale applied when width and height are omitted - * @param fitMode image fit policy used when drawing inside explicit bounds - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param imageData semantic image payload + * @param width optional target width + * @param height optional target height + * @param scale optional uniform scale applied when width and height are omitted + * @param fitMode image fit policy used when drawing inside explicit bounds + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param transform render-time affine transform; defaults to - * {@link DocumentTransform#NONE}. - * + * @param padding inner padding + * @param margin outer margin + * @param transform render-time affine transform; defaults to + * {@link DocumentTransform#NONE}. * @author Artem Demchyshyn */ public record ImageNode( @@ -62,12 +61,12 @@ public record ImageNode( /** * Backward-compatible convenience constructor without link/bookmark metadata. * - * @param name node name used in snapshots and layout graph paths + * @param name node name used in snapshots and layout graph paths * @param imageData semantic image payload - * @param width optional target width - * @param height optional target height - * @param padding inner padding - * @param margin outer margin + * @param width optional target width + * @param height optional target height + * @param padding inner padding + * @param margin outer margin */ public ImageNode(String name, DocumentImageData imageData, @@ -81,14 +80,14 @@ public ImageNode(String name, /** * Backward-compatible convenience constructor without image fit options. * - * @param name node name used in snapshots and layout graph paths - * @param imageData semantic image payload - * @param width optional target width - * @param height optional target height - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param imageData semantic image payload + * @param width optional target width + * @param height optional target height + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ImageNode(String name, DocumentImageData imageData, @@ -105,16 +104,16 @@ public ImageNode(String name, * Backward-compatible convenience constructor without transform — defaults * to {@link DocumentTransform#NONE}. * - * @param name node name used in snapshots and layout graph paths - * @param imageData semantic image payload - * @param width optional target width - * @param height optional target height - * @param scale optional uniform scale applied when width and height are omitted - * @param fitMode image fit policy used when drawing inside explicit bounds - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param imageData semantic image payload + * @param width optional target width + * @param height optional target height + * @param scale optional uniform scale applied when width and height are omitted + * @param fitMode image fit policy used when drawing inside explicit bounds + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ImageNode(String name, DocumentImageData imageData, diff --git a/src/main/java/com/demcha/compose/document/node/InlineImageRun.java b/src/main/java/com/demcha/compose/document/node/InlineImageRun.java index a2445e37a..97b6bfb7f 100644 --- a/src/main/java/com/demcha/compose/document/node/InlineImageRun.java +++ b/src/main/java/com/demcha/compose/document/node/InlineImageRun.java @@ -13,16 +13,15 @@ * can carry their own link metadata so the resulting PDF annotation covers * the icon (or icon + label, when callers split the link across runs).

* - * @param imageData semantic image payload; never {@code null} - * @param width target width in points; must be finite and positive - * @param height target height in points; must be finite and positive - * @param alignment vertical alignment relative to the surrounding text; - * defaults to {@link InlineImageAlignment#CENTER} + * @param imageData semantic image payload; never {@code null} + * @param width target width in points; must be finite and positive + * @param height target height in points; must be finite and positive + * @param alignment vertical alignment relative to the surrounding text; + * defaults to {@link InlineImageAlignment#CENTER} * @param baselineOffset extra vertical offset in points applied after * {@code alignment} resolution; positive values move * the image up - * @param linkOptions optional per-run link metadata - * + * @param linkOptions optional per-run link metadata * @author Artem Demchyshyn */ public record InlineImageRun( @@ -55,8 +54,8 @@ public record InlineImageRun( * alignment and zero offset. * * @param imageData image payload - * @param width target width in points - * @param height target height in points + * @param width target width in points + * @param height target height in points */ public InlineImageRun(DocumentImageData imageData, double width, double height) { this(imageData, width, height, InlineImageAlignment.CENTER, 0.0, null); @@ -67,8 +66,8 @@ public InlineImageRun(DocumentImageData imageData, double width, double height) * link metadata. * * @param imageData image payload - * @param width target width in points - * @param height target height in points + * @param width target width in points + * @param height target height in points * @param alignment vertical alignment */ public InlineImageRun(DocumentImageData imageData, diff --git a/src/main/java/com/demcha/compose/document/node/InlineShapeRun.java b/src/main/java/com/demcha/compose/document/node/InlineShapeRun.java index a2b0a6073..06237bc15 100644 --- a/src/main/java/com/demcha/compose/document/node/InlineShapeRun.java +++ b/src/main/java/com/demcha/compose/document/node/InlineShapeRun.java @@ -26,15 +26,14 @@ * layers overlaid and centred: a checkbox is a box layer plus an optional * checkmark layer, each with its own colour.

* - * @param layers one or more paint layers, drawn back-to-front and centred in the - * run's bounding box - * @param alignment vertical alignment relative to the surrounding text; - * defaults to {@link InlineImageAlignment#CENTER} + * @param layers one or more paint layers, drawn back-to-front and centred in the + * run's bounding box + * @param alignment vertical alignment relative to the surrounding text; + * defaults to {@link InlineImageAlignment#CENTER} * @param baselineOffset extra vertical offset in points applied after * {@code alignment} resolution; positive values move the * figure up - * @param linkOptions optional per-run link metadata - * + * @param linkOptions optional per-run link metadata * @author Artem Demchyshyn * @since 1.7.0 */ @@ -63,12 +62,12 @@ public record InlineShapeRun( /** * Single-layer convenience constructor. * - * @param outline figure geometry - * @param fill optional fill color - * @param stroke optional outline stroke - * @param alignment vertical alignment relative to surrounding text + * @param outline figure geometry + * @param fill optional fill color + * @param stroke optional outline stroke + * @param alignment vertical alignment relative to surrounding text * @param baselineOffset extra vertical shift in points; positive moves up - * @param linkOptions optional inline link metadata + * @param linkOptions optional inline link metadata */ public InlineShapeRun(ShapeOutline outline, DocumentColor fill, @@ -84,7 +83,7 @@ public InlineShapeRun(ShapeOutline outline, * {@link InlineImageAlignment#CENTER} alignment and zero offset. * * @param outline figure geometry - * @param fill fill color; must not be {@code null} + * @param fill fill color; must not be {@code null} */ public InlineShapeRun(ShapeOutline outline, DocumentColor fill) { this(outline, Objects.requireNonNull(fill, "fill"), null, InlineImageAlignment.CENTER, 0.0, null); @@ -123,9 +122,9 @@ public double height() { * own colour. The frame is stroke-only; the checkmark, when present, is a * smaller filled figure centred inside the frame. * - * @param size box width and height in points - * @param checked whether the checkmark is shown - * @param boxColor frame stroke color + * @param size box width and height in points + * @param checked whether the checkmark is shown + * @param boxColor frame stroke color * @param checkColor checkmark fill color * @return checkbox shape run */ @@ -142,10 +141,10 @@ public static InlineShapeRun checkbox(double size, * mark is sized to fit the frame automatically; an unchecked box ignores the * style and renders the frame alone. * - * @param size box width and height in points - * @param checked whether the checkmark is shown - * @param markStyle design of the checked-state tick - * @param boxColor frame stroke color + * @param size box width and height in points + * @param checked whether the checkmark is shown + * @param markStyle design of the checked-state tick + * @param boxColor frame stroke color * @param checkColor checkmark fill color * @return checkbox shape run * @since 1.7.0 @@ -168,11 +167,11 @@ public static InlineShapeRun checkbox(double size, * own size, so size it to fit (≈ {@code 0.6 × size}); an unchecked box * renders the frame alone and the {@code mark} is ignored. * - * @param size box width and height in points - * @param checked whether the mark is shown - * @param mark checked-state mark geometry, already sized; must be non-null - * when {@code checked} is {@code true} - * @param boxColor frame stroke color + * @param size box width and height in points + * @param checked whether the mark is shown + * @param mark checked-state mark geometry, already sized; must be non-null + * when {@code checked} is {@code true} + * @param boxColor frame stroke color * @param checkColor mark fill color * @return checkbox shape run * @since 1.7.0 diff --git a/src/main/java/com/demcha/compose/document/node/InlineTextRun.java b/src/main/java/com/demcha/compose/document/node/InlineTextRun.java index 661900a79..79a917e01 100644 --- a/src/main/java/com/demcha/compose/document/node/InlineTextRun.java +++ b/src/main/java/com/demcha/compose/document/node/InlineTextRun.java @@ -1,13 +1,12 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.style.DocumentTextStyle; /** * One styled inline text run inside a semantic paragraph. * - * @param text visible text for the run - * @param textStyle style for this run; falls back to the paragraph style when null + * @param text visible text for the run + * @param textStyle style for this run; falls back to the paragraph style when null * @param linkOptions optional link metadata scoped only to this run * @author Artem Demchyshyn */ @@ -26,7 +25,7 @@ public record InlineTextRun( /** * Creates a styled inline run without link metadata. * - * @param text visible text + * @param text visible text * @param textStyle style for this run */ public InlineTextRun(String text, DocumentTextStyle textStyle) { diff --git a/src/main/java/com/demcha/compose/document/node/LayerAlign.java b/src/main/java/com/demcha/compose/document/node/LayerAlign.java index 6039688b6..3ae175183 100644 --- a/src/main/java/com/demcha/compose/document/node/LayerAlign.java +++ b/src/main/java/com/demcha/compose/document/node/LayerAlign.java @@ -10,22 +10,40 @@ * @author Artem Demchyshyn */ public enum LayerAlign { - /** Anchored to the top-left corner of the stack box. */ + /** + * Anchored to the top-left corner of the stack box. + */ TOP_LEFT, - /** Centered horizontally and anchored to the top edge. */ + /** + * Centered horizontally and anchored to the top edge. + */ TOP_CENTER, - /** Anchored to the top-right corner of the stack box. */ + /** + * Anchored to the top-right corner of the stack box. + */ TOP_RIGHT, - /** Centered vertically and anchored to the left edge. */ + /** + * Centered vertically and anchored to the left edge. + */ CENTER_LEFT, - /** Centered both horizontally and vertically. */ + /** + * Centered both horizontally and vertically. + */ CENTER, - /** Centered vertically and anchored to the right edge. */ + /** + * Centered vertically and anchored to the right edge. + */ CENTER_RIGHT, - /** Anchored to the bottom-left corner of the stack box. */ + /** + * Anchored to the bottom-left corner of the stack box. + */ BOTTOM_LEFT, - /** Centered horizontally and anchored to the bottom edge. */ + /** + * Centered horizontally and anchored to the bottom edge. + */ BOTTOM_CENTER, - /** Anchored to the bottom-right corner of the stack box. */ + /** + * Anchored to the bottom-right corner of the stack box. + */ BOTTOM_RIGHT } diff --git a/src/main/java/com/demcha/compose/document/node/LayerStackNode.java b/src/main/java/com/demcha/compose/document/node/LayerStackNode.java index efb21e459..863657d26 100644 --- a/src/main/java/com/demcha/compose/document/node/LayerStackNode.java +++ b/src/main/java/com/demcha/compose/document/node/LayerStackNode.java @@ -17,10 +17,10 @@ *

Pagination is atomic: the entire stack moves to the next page when its * measured height does not fit on the current page.

* - * @param name node name used in snapshots and layout graph paths - * @param layers child layers in back-to-front order + * @param name node name used in snapshots and layout graph paths + * @param layers child layers in back-to-front order * @param padding inner padding applied around all layers - * @param margin outer margin around the stack + * @param margin outer margin around the stack * @author Artem Demchyshyn */ public record LayerStackNode( @@ -74,12 +74,12 @@ public List children() { * share a {@code zIndex} keep source order. The default is * {@code 0} which preserves source order entirely.

* - * @param node child node painted in this layer - * @param align alignment of the layer inside the stack box + * @param node child node painted in this layer + * @param align alignment of the layer inside the stack box * @param offsetX horizontal offset from the anchor (positive = right) * @param offsetY vertical offset from the anchor (positive = down) - * @param zIndex render-order key; higher values render on top of - * lower values in the same parent stack/container + * @param zIndex render-order key; higher values render on top of + * lower values in the same parent stack/container */ public record Layer(DocumentNode node, LayerAlign align, double offsetX, double offsetY, int zIndex) { /** @@ -103,7 +103,7 @@ public Layer(DocumentNode node) { /** * Creates a layer with explicit alignment and zero offset / zero zIndex. * - * @param node child node + * @param node child node * @param align alignment of the layer */ public Layer(DocumentNode node, LayerAlign align) { @@ -115,8 +115,8 @@ public Layer(DocumentNode node, LayerAlign align) { * shape (node + align + offsets) compiling for callers that * pre-date Phase C.3. Defaults {@code zIndex} to {@code 0}. * - * @param node child node - * @param align alignment of the layer + * @param node child node + * @param align alignment of the layer * @param offsetX horizontal offset from the anchor * @param offsetY vertical offset from the anchor */ @@ -147,7 +147,7 @@ public static Layer center(DocumentNode node) { /** * Convenience factory for an explicitly aligned layer with no offset. * - * @param node child node + * @param node child node * @param align alignment of the layer * @return aligned layer */ @@ -158,8 +158,8 @@ public static Layer of(DocumentNode node, LayerAlign align) { /** * Convenience factory for a layer positioned by anchor + screen-space offset. * - * @param node child node - * @param align anchor inside the stack box + * @param node child node + * @param align anchor inside the stack box * @param offsetX horizontal offset from the anchor (positive = right) * @param offsetY vertical offset from the anchor (positive = down) * @return positioned layer diff --git a/src/main/java/com/demcha/compose/document/node/LineNode.java b/src/main/java/com/demcha/compose/document/node/LineNode.java index 02007c201..e0c744c14 100644 --- a/src/main/java/com/demcha/compose/document/node/LineNode.java +++ b/src/main/java/com/demcha/compose/document/node/LineNode.java @@ -8,22 +8,22 @@ /** * Atomic semantic line drawn inside a fixed-size box. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved line box width - * @param height resolved line box height - * @param startX line start x offset inside the box - * @param startY line start y offset inside the box - * @param endX line end x offset inside the box - * @param endY line end y offset inside the box - * @param stroke line stroke descriptor - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved line box width + * @param height resolved line box height + * @param startX line start x offset inside the box + * @param startY line start y offset inside the box + * @param endX line end x offset inside the box + * @param endY line end y offset inside the box + * @param stroke line stroke descriptor + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param transform render-time affine transform; defaults to - * {@link DocumentTransform#NONE}. - * @param dashPattern dash pattern for the stroke; defaults to - * {@link DocumentDashPattern#NONE} (solid) + * @param padding inner padding + * @param margin outer margin + * @param transform render-time affine transform; defaults to + * {@link DocumentTransform#NONE}. + * @param dashPattern dash pattern for the stroke; defaults to + * {@link DocumentDashPattern#NONE} (solid) * @author Artem Demchyshyn */ public record LineNode( @@ -63,19 +63,19 @@ public record LineNode( * Backward-compatible constructor without a dash pattern — defaults to a * solid stroke ({@link DocumentDashPattern#NONE}). * - * @param name node name used in snapshots and layout graph paths - * @param width resolved line box width - * @param height resolved line box height - * @param startX line start x offset inside the box - * @param startY line start y offset inside the box - * @param endX line end x offset inside the box - * @param endY line end y offset inside the box - * @param stroke line stroke descriptor - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved line box width + * @param height resolved line box height + * @param startX line start x offset inside the box + * @param startY line start y offset inside the box + * @param endX line end x offset inside the box + * @param endY line end y offset inside the box + * @param stroke line stroke descriptor + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param transform render-time affine transform + * @param padding inner padding + * @param margin outer margin + * @param transform render-time affine transform */ public LineNode(String name, double width, @@ -97,18 +97,18 @@ public LineNode(String name, * Backward-compatible convenience constructor without transform — defaults * to {@link DocumentTransform#NONE}. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved line box width - * @param height resolved line box height - * @param startX line start x offset inside the box - * @param startY line start y offset inside the box - * @param endX line end x offset inside the box - * @param endY line end y offset inside the box - * @param stroke line stroke descriptor - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved line box width + * @param height resolved line box height + * @param startX line start x offset inside the box + * @param startY line start y offset inside the box + * @param endX line end x offset inside the box + * @param endY line end y offset inside the box + * @param stroke line stroke descriptor + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public LineNode(String name, double width, diff --git a/src/main/java/com/demcha/compose/document/node/ListItem.java b/src/main/java/com/demcha/compose/document/node/ListItem.java index 965d1332e..7a17a0357 100644 --- a/src/main/java/com/demcha/compose/document/node/ListItem.java +++ b/src/main/java/com/demcha/compose/document/node/ListItem.java @@ -16,11 +16,10 @@ * item. Direct {@code new ListItem(...)} construction is supported but * should be reserved for record-shaped fixtures and serialization.

* - * @param label visible item text - * @param marker per-item marker override, or {@code null} to inherit - * the per-depth default from the parent list + * @param label visible item text + * @param marker per-item marker override, or {@code null} to inherit + * the per-depth default from the parent list * @param children nested child items, empty for leaves - * * @author Artem Demchyshyn */ public record ListItem(String label, ListMarker marker, List children) { @@ -46,7 +45,7 @@ public static ListItem of(String label) { * Creates an item with the given label, inherited marker, and * child sub-tree. * - * @param label visible item text + * @param label visible item text * @param children nested child items * @return parent item */ diff --git a/src/main/java/com/demcha/compose/document/node/ListNode.java b/src/main/java/com/demcha/compose/document/node/ListNode.java index a6242a260..43bb2b217 100644 --- a/src/main/java/com/demcha/compose/document/node/ListNode.java +++ b/src/main/java/com/demcha/compose/document/node/ListNode.java @@ -30,18 +30,18 @@ * are ignored. When {@code nestedItems} is empty, the node behaves * exactly like the v1.5 flat list.

* - * @param name optional semantic name used in snapshots and diagnostics - * @param items item texts in source order — used when {@code nestedItems} is empty - * @param nestedItems nested item tree, empty for flat lists - * @param marker top-level marker rendered before each flat item - * @param textStyle shared item text style - * @param align horizontal alignment for item text - * @param lineSpacing extra space between wrapped lines within one item - * @param itemSpacing extra space between list items + * @param name optional semantic name used in snapshots and diagnostics + * @param items item texts in source order — used when {@code nestedItems} is empty + * @param nestedItems nested item tree, empty for flat lists + * @param marker top-level marker rendered before each flat item + * @param textStyle shared item text style + * @param align horizontal alignment for item text + * @param lineSpacing extra space between wrapped lines within one item + * @param itemSpacing extra space between list items * @param continuationIndent prefix used only for wrapped continuation lines when the marker is hidden - * @param normalizeMarkers whether leading user-supplied bullets or dashes are stripped - * @param padding inner list padding - * @param margin outer list margin + * @param normalizeMarkers whether leading user-supplied bullets or dashes are stripped + * @param padding inner list padding + * @param margin outer list margin * @author Artem Demchyshyn */ public record ListNode( @@ -83,17 +83,17 @@ public record ListNode( * Back-compat constructor matching the v1.4 / v1.5 11-component * signature. Treats the list as flat (no nested items). * - * @param name optional semantic name used in snapshots and diagnostics - * @param items item texts in source order — used when {@code nestedItems} is empty - * @param marker top-level marker rendered before each flat item - * @param textStyle shared item text style - * @param align horizontal alignment for item text - * @param lineSpacing extra space between wrapped lines within one item - * @param itemSpacing extra space between list items + * @param name optional semantic name used in snapshots and diagnostics + * @param items item texts in source order — used when {@code nestedItems} is empty + * @param marker top-level marker rendered before each flat item + * @param textStyle shared item text style + * @param align horizontal alignment for item text + * @param lineSpacing extra space between wrapped lines within one item + * @param itemSpacing extra space between list items * @param continuationIndent prefix used only for wrapped continuation lines when the marker is hidden - * @param normalizeMarkers whether leading user-supplied bullets or dashes are stripped - * @param padding inner list padding - * @param margin outer list margin + * @param normalizeMarkers whether leading user-supplied bullets or dashes are stripped + * @param padding inner list padding + * @param margin outer list margin */ public ListNode(String name, List items, diff --git a/src/main/java/com/demcha/compose/document/node/PageBreakNode.java b/src/main/java/com/demcha/compose/document/node/PageBreakNode.java index 814d0fe6d..eaface920 100644 --- a/src/main/java/com/demcha/compose/document/node/PageBreakNode.java +++ b/src/main/java/com/demcha/compose/document/node/PageBreakNode.java @@ -9,7 +9,7 @@ * uses it as a control signal that forces subsequent content onto the next * page.

* - * @param name semantic name used in snapshots and diagnostics + * @param name semantic name used in snapshots and diagnostics * @param margin optional surrounding spacing; {@code null} resolves to zero */ public record PageBreakNode(String name, DocumentInsets margin) implements DocumentNode { @@ -17,7 +17,7 @@ public record PageBreakNode(String name, DocumentInsets margin) implements Docum /** * Creates a page-break node. * - * @param name semantic name used in snapshots and diagnostics + * @param name semantic name used in snapshots and diagnostics * @param margin optional surrounding spacing; {@code null} resolves to zero */ public PageBreakNode { diff --git a/src/main/java/com/demcha/compose/document/node/ParagraphNode.java b/src/main/java/com/demcha/compose/document/node/ParagraphNode.java index 7befed545..ca831884a 100644 --- a/src/main/java/com/demcha/compose/document/node/ParagraphNode.java +++ b/src/main/java/com/demcha/compose/document/node/ParagraphNode.java @@ -1,7 +1,5 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextAutoSize; import com.demcha.compose.document.style.DocumentTextIndent; @@ -13,22 +11,22 @@ /** * Semantic paragraph block that may split across pages. * - * @param name node name used in snapshots and layout graph paths - * @param text paragraph text when inline runs are not supplied - * @param inlineRuns optional inline runs in source order; may mix text and - * image runs and is wrapped on a single baseline - * @param textStyle base paragraph text style - * @param align horizontal text alignment - * @param lineSpacing extra space between wrapped lines - * @param bulletOffset first-line prefix used by list-style paragraph paths - * @param indentStrategy hanging/first-line indent strategy - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param text paragraph text when inline runs are not supplied + * @param inlineRuns optional inline runs in source order; may mix text and + * image runs and is wrapped on a single baseline + * @param textStyle base paragraph text style + * @param align horizontal text alignment + * @param lineSpacing extra space between wrapped lines + * @param bulletOffset first-line prefix used by list-style paragraph paths + * @param indentStrategy hanging/first-line indent strategy + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param autoSize optional automatic font down-scaling policy - * @param verticalAlign vertical seating of the text within its line box - * ({@link TextVerticalAlign#DEFAULT} keeps baseline seating) + * @param padding inner padding + * @param margin outer margin + * @param autoSize optional automatic font down-scaling policy + * @param verticalAlign vertical seating of the text within its line box + * ({@link TextVerticalAlign#DEFAULT} keeps baseline seating) * @author Artem Demchyshyn */ public record ParagraphNode( @@ -80,19 +78,19 @@ public record ParagraphNode( * Backwards-compatible 13-arg constructor without a vertical-alignment * override; defaults {@link TextVerticalAlign#DEFAULT}. * - * @param name node name used in snapshots and layout graph paths - * @param text paragraph text when inline runs are not supplied - * @param inlineRuns optional inline runs in source order - * @param textStyle base paragraph text style - * @param align horizontal text alignment - * @param lineSpacing extra space between wrapped lines - * @param bulletOffset first-line prefix used by list-style paragraph paths - * @param indentStrategy hanging/first-line indent strategy - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param text paragraph text when inline runs are not supplied + * @param inlineRuns optional inline runs in source order + * @param textStyle base paragraph text style + * @param align horizontal text alignment + * @param lineSpacing extra space between wrapped lines + * @param bulletOffset first-line prefix used by list-style paragraph paths + * @param indentStrategy hanging/first-line indent strategy + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param autoSize optional automatic font down-scaling policy + * @param padding inner padding + * @param margin outer margin + * @param autoSize optional automatic font down-scaling policy */ public ParagraphNode(String name, String text, @@ -114,19 +112,19 @@ public ParagraphNode(String name, /** * Backwards-compatible 12-arg canonical constructor without auto-size. * - * @param name node name used in snapshots and layout graph paths - * @param text paragraph text when inline runs are not supplied - * @param inlineRuns optional inline runs in source order; may mix text and - * image runs and is wrapped on a single baseline - * @param textStyle base paragraph text style - * @param align horizontal text alignment - * @param lineSpacing extra space between wrapped lines - * @param bulletOffset first-line prefix used by list-style paragraph paths - * @param indentStrategy hanging/first-line indent strategy - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param text paragraph text when inline runs are not supplied + * @param inlineRuns optional inline runs in source order; may mix text and + * image runs and is wrapped on a single baseline + * @param textStyle base paragraph text style + * @param align horizontal text alignment + * @param lineSpacing extra space between wrapped lines + * @param bulletOffset first-line prefix used by list-style paragraph paths + * @param indentStrategy hanging/first-line indent strategy + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ParagraphNode(String name, String text, @@ -147,17 +145,17 @@ public ParagraphNode(String name, /** * Creates a paragraph from plain text with optional link and bookmark metadata. * - * @param name node name used in snapshots and layout graph paths - * @param text paragraph text - * @param textStyle paragraph style - * @param align horizontal alignment - * @param lineSpacing extra spacing between wrapped lines - * @param bulletOffset first-line marker or prefix - * @param indentStrategy text indent strategy - * @param linkOptions optional link metadata + * @param name node name used in snapshots and layout graph paths + * @param text paragraph text + * @param textStyle paragraph style + * @param align horizontal alignment + * @param lineSpacing extra spacing between wrapped lines + * @param bulletOffset first-line marker or prefix + * @param indentStrategy text indent strategy + * @param linkOptions optional link metadata * @param bookmarkOptions optional bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ParagraphNode(String name, String text, @@ -176,15 +174,15 @@ public ParagraphNode(String name, /** * Creates a paragraph from plain text without link or bookmark metadata. * - * @param name node name used in snapshots and layout graph paths - * @param text paragraph text - * @param textStyle paragraph style - * @param align horizontal alignment - * @param lineSpacing extra spacing between wrapped lines - * @param bulletOffset first-line marker or prefix + * @param name node name used in snapshots and layout graph paths + * @param text paragraph text + * @param textStyle paragraph style + * @param align horizontal alignment + * @param lineSpacing extra spacing between wrapped lines + * @param bulletOffset first-line marker or prefix * @param indentStrategy text indent strategy - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ParagraphNode(String name, String text, @@ -201,13 +199,13 @@ public ParagraphNode(String name, /** * Creates a paragraph without marker indentation. * - * @param name node name used in snapshots and layout graph paths - * @param text paragraph text - * @param textStyle paragraph style - * @param align horizontal alignment + * @param name node name used in snapshots and layout graph paths + * @param text paragraph text + * @param textStyle paragraph style + * @param align horizontal alignment * @param lineSpacing extra spacing between wrapped lines - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ParagraphNode(String name, String text, @@ -219,6 +217,23 @@ public ParagraphNode(String name, this(name, text, textStyle, align, lineSpacing, "", DocumentTextIndent.NONE, null, null, padding, margin); } + private static List normalizeInlineRuns(List runs) { + if (runs == null || runs.isEmpty()) { + return List.of(); + } + List normalized = new java.util.ArrayList<>(runs.size()); + for (InlineRun run : runs) { + if (run == null) { + continue; + } + if (run instanceof InlineTextRun textRun && textRun.text().isEmpty()) { + continue; + } + normalized.add(run); + } + return List.copyOf(normalized); + } + /** * Returns inline text runs in source order, filtering out image runs. * @@ -240,23 +255,6 @@ public List inlineTextRuns() { } return List.copyOf(textRuns); } - - private static List normalizeInlineRuns(List runs) { - if (runs == null || runs.isEmpty()) { - return List.of(); - } - List normalized = new java.util.ArrayList<>(runs.size()); - for (InlineRun run : runs) { - if (run == null) { - continue; - } - if (run instanceof InlineTextRun textRun && textRun.text().isEmpty()) { - continue; - } - normalized.add(run); - } - return List.copyOf(normalized); - } } diff --git a/src/main/java/com/demcha/compose/document/node/PolygonNode.java b/src/main/java/com/demcha/compose/document/node/PolygonNode.java index 258017e28..f75fc7e3d 100644 --- a/src/main/java/com/demcha/compose/document/node/PolygonNode.java +++ b/src/main/java/com/demcha/compose/document/node/PolygonNode.java @@ -19,15 +19,14 @@ * tomorrow. It renders through the existing polygon fragment pipeline — no * backend gains any new handler for it.

* - * @param name node name used in snapshots and layout graph paths - * @param width resolved box width - * @param height resolved box height - * @param points normalized vertices in draw order; at least three + * @param name node name used in snapshots and layout graph paths + * @param width resolved box width + * @param height resolved box height + * @param points normalized vertices in draw order; at least three * @param fillColor optional fill colour - * @param stroke optional outline stroke - * @param padding inner padding - * @param margin outer margin - * + * @param stroke optional outline stroke + * @param padding inner padding + * @param margin outer margin * @author Artem Demchyshyn * @since 1.8.0 */ @@ -41,7 +40,9 @@ public record PolygonNode( DocumentInsets padding, DocumentInsets margin ) implements DocumentNode { - /** Validates dimensions and the vertex list; copy-protects the vertices. */ + /** + * Validates dimensions and the vertex list; copy-protects the vertices. + */ public PolygonNode { name = name == null ? "" : name; Objects.requireNonNull(points, "points"); diff --git a/src/main/java/com/demcha/compose/document/node/RowNode.java b/src/main/java/com/demcha/compose/document/node/RowNode.java index 70309cff9..d0899d21e 100644 --- a/src/main/java/com/demcha/compose/document/node/RowNode.java +++ b/src/main/java/com/demcha/compose/document/node/RowNode.java @@ -1,10 +1,6 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.style.DocumentBorders; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; +import com.demcha.compose.document.style.*; import java.util.List; import java.util.Objects; @@ -23,17 +19,16 @@ * {@link ContainerNode}) acting as columns. Nested rows and tables are * disallowed at the DSL boundary.

* - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param weights optional per-child weights (length must match children, or be empty) - * @param gap horizontal gap between children - * @param padding inner padding - * @param margin outer margin - * @param fillColor optional background fill - * @param stroke optional border stroke + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param weights optional per-child weights (length must match children, or be empty) + * @param gap horizontal gap between children + * @param padding inner padding + * @param margin outer margin + * @param fillColor optional background fill + * @param stroke optional border stroke * @param cornerRadius optional render-only corner radius - * @param borders optional per-side border strokes overriding the uniform stroke - * + * @param borders optional per-side border strokes overriding the uniform stroke * @author Artem Demchyshyn */ public record RowNode( @@ -58,7 +53,7 @@ public record RowNode( weights = weights == null ? List.of() : List.copyOf(weights); if (!weights.isEmpty() && weights.size() != children.size()) { throw new IllegalArgumentException("RowNode weights size " + weights.size() - + " does not match children size " + children.size()); + + " does not match children size " + children.size()); } for (Double weight : weights) { if (weight == null || Double.isNaN(weight) || Double.isInfinite(weight) || weight <= 0.0) { @@ -77,14 +72,14 @@ public record RowNode( /** * Backwards-compatible constructor without per-side borders. * - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param weights optional per-child weights (length must match children, or be empty) - * @param gap horizontal gap between children - * @param padding inner padding - * @param margin outer margin - * @param fillColor optional background fill - * @param stroke optional border stroke + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param weights optional per-child weights (length must match children, or be empty) + * @param gap horizontal gap between children + * @param padding inner padding + * @param margin outer margin + * @param fillColor optional background fill + * @param stroke optional border stroke * @param cornerRadius optional render-only corner radius */ public RowNode(String name, diff --git a/src/main/java/com/demcha/compose/document/node/SectionNode.java b/src/main/java/com/demcha/compose/document/node/SectionNode.java index 51e651ecf..f9aa0e3f4 100644 --- a/src/main/java/com/demcha/compose/document/node/SectionNode.java +++ b/src/main/java/com/demcha/compose/document/node/SectionNode.java @@ -1,10 +1,6 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.style.DocumentBorders; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; +import com.demcha.compose.document.style.*; import java.util.List; import java.util.Objects; @@ -12,19 +8,18 @@ /** * Vertical semantic section node. * - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param spacing vertical spacing between children - * @param padding inner padding - * @param margin outer margin - * @param fillColor optional background fill - * @param stroke optional uniform border stroke + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param spacing vertical spacing between children + * @param padding inner padding + * @param margin outer margin + * @param fillColor optional background fill + * @param stroke optional uniform border stroke * @param cornerRadius optional render-only corner radius - * @param borders optional per-side border strokes overriding the uniform stroke + * @param borders optional per-side border strokes overriding the uniform stroke * @param keepTogether when {@code true}, the section relocates whole to the next * page instead of orphaning its leading children when it does * not fit in the remaining page space (and fits on a fresh page) - * * @author Artem Demchyshyn */ public record SectionNode( @@ -59,15 +54,15 @@ public record SectionNode( * Backward-compatible constructor without the keep-together flag (defaults to * normal flow). * - * @param name node name - * @param children child nodes - * @param spacing vertical spacing - * @param padding inner padding - * @param margin outer margin - * @param fillColor optional background fill - * @param stroke optional uniform border stroke + * @param name node name + * @param children child nodes + * @param spacing vertical spacing + * @param padding inner padding + * @param margin outer margin + * @param fillColor optional background fill + * @param stroke optional uniform border stroke * @param cornerRadius optional render-only corner radius - * @param borders optional per-side borders + * @param borders optional per-side borders */ public SectionNode(String name, List children, @@ -84,13 +79,13 @@ public SectionNode(String name, /** * Creates a vertical semantic section without per-side borders. * - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param spacing vertical spacing between children - * @param padding inner padding - * @param margin outer margin - * @param fillColor optional background fill - * @param stroke optional uniform border stroke + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param spacing vertical spacing between children + * @param padding inner padding + * @param margin outer margin + * @param fillColor optional background fill + * @param stroke optional uniform border stroke * @param cornerRadius optional render-only corner radius */ public SectionNode(String name, @@ -107,13 +102,13 @@ public SectionNode(String name, /** * Creates a vertical semantic section with square corners and no per-side borders. * - * @param name node name used in snapshots and layout graph paths - * @param children child semantic nodes in source order - * @param spacing vertical spacing between children - * @param padding inner padding - * @param margin outer margin + * @param name node name used in snapshots and layout graph paths + * @param children child semantic nodes in source order + * @param spacing vertical spacing between children + * @param padding inner padding + * @param margin outer margin * @param fillColor optional background fill - * @param stroke optional uniform border stroke + * @param stroke optional uniform border stroke */ public SectionNode(String name, List children, diff --git a/src/main/java/com/demcha/compose/document/node/ShapeContainerNode.java b/src/main/java/com/demcha/compose/document/node/ShapeContainerNode.java index 1ffc771da..74f282619 100644 --- a/src/main/java/com/demcha/compose/document/node/ShapeContainerNode.java +++ b/src/main/java/com/demcha/compose/document/node/ShapeContainerNode.java @@ -1,11 +1,6 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.style.ClipPolicy; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTransform; -import com.demcha.compose.document.style.ShapeOutline; +import com.demcha.compose.document.style.*; import java.util.ArrayList; import java.util.List; @@ -32,23 +27,22 @@ *

Pagination is atomic: the outline plus all of its layers stays on the * same page or moves to the next as one unit.

* - * @param name node name used in snapshots and layout graph paths - * @param outline geometric outline that drives the bounding box - * @param layers child layers in back-to-front order; must contain at least one + * @param name node name used in snapshots and layout graph paths + * @param outline geometric outline that drives the bounding box + * @param layers child layers in back-to-front order; must contain at least one * @param clipPolicy how children are clipped relative to the outline - * @param fillColor optional outline fill colour - * @param stroke optional outline stroke - * @param padding inner padding applied around all layers (subtracted from outline) - * @param margin outer margin around the container - * @param transform render-time affine transform (rotation around the - * placement centre and/or scaling) applied to the - * outline + layers as a single unit; defaults to - * {@link DocumentTransform#NONE}. The canonical layout - * layer measures and places the node against its - * natural bounding box — backends apply the transform - * during render so layout snapshots stay deterministic - * regardless of rotation/scale. - * + * @param fillColor optional outline fill colour + * @param stroke optional outline stroke + * @param padding inner padding applied around all layers (subtracted from outline) + * @param margin outer margin around the container + * @param transform render-time affine transform (rotation around the + * placement centre and/or scaling) applied to the + * outline + layers as a single unit; defaults to + * {@link DocumentTransform#NONE}. The canonical layout + * layer measures and places the node against its + * natural bounding box — backends apply the transform + * during render so layout snapshots stay deterministic + * regardless of rotation/scale. * @author Artem Demchyshyn */ public record ShapeContainerNode( @@ -68,14 +62,14 @@ public record ShapeContainerNode( * {@link DocumentTransform#NONE}. Lets existing callers built before * Phase C compile without changes. * - * @param name node name used in snapshots and layout graph paths - * @param outline geometric outline that drives the bounding box - * @param layers child layers in back-to-front order + * @param name node name used in snapshots and layout graph paths + * @param outline geometric outline that drives the bounding box + * @param layers child layers in back-to-front order * @param clipPolicy how children are clipped relative to the outline - * @param fillColor optional outline fill colour - * @param stroke optional outline stroke - * @param padding inner padding applied around all layers - * @param margin outer margin around the container + * @param fillColor optional outline fill colour + * @param stroke optional outline stroke + * @param padding inner padding applied around all layers + * @param margin outer margin around the container */ public ShapeContainerNode(String name, ShapeOutline outline, @@ -119,8 +113,8 @@ public ShapeContainerNode(String name, /** * @return ordered child node references — equivalent to - * {@code layers.stream().map(Layer::node)}, kept aligned with - * {@link DocumentNode#children()}'s contract + * {@code layers.stream().map(Layer::node)}, kept aligned with + * {@link DocumentNode#children()}'s contract */ @Override public List children() { diff --git a/src/main/java/com/demcha/compose/document/node/ShapeLayer.java b/src/main/java/com/demcha/compose/document/node/ShapeLayer.java index 54aafafc4..644374619 100644 --- a/src/main/java/com/demcha/compose/document/node/ShapeLayer.java +++ b/src/main/java/com/demcha/compose/document/node/ShapeLayer.java @@ -17,9 +17,8 @@ * * @param outline figure geometry; its {@link ShapeOutline#width()} / * {@link ShapeOutline#height()} size this layer - * @param fill optional fill color; {@code null} leaves the interior empty - * @param stroke optional outline stroke; {@code null} leaves no border - * + * @param fill optional fill color; {@code null} leaves the interior empty + * @param stroke optional outline stroke; {@code null} leaves no border * @author Artem Demchyshyn * @since 1.7.0 */ @@ -38,7 +37,7 @@ public record ShapeLayer(ShapeOutline outline, DocumentColor fill, DocumentStrok * Creates a filled layer with no stroke. * * @param outline figure geometry - * @param fill fill color; must not be {@code null} + * @param fill fill color; must not be {@code null} */ public ShapeLayer(ShapeOutline outline, DocumentColor fill) { this(outline, Objects.requireNonNull(fill, "fill"), null); diff --git a/src/main/java/com/demcha/compose/document/node/ShapeNode.java b/src/main/java/com/demcha/compose/document/node/ShapeNode.java index ae4e0cdc8..bb833ad8a 100644 --- a/src/main/java/com/demcha/compose/document/node/ShapeNode.java +++ b/src/main/java/com/demcha/compose/document/node/ShapeNode.java @@ -1,37 +1,31 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentPaint; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTransform; +import com.demcha.compose.document.style.*; -import java.awt.Color; +import java.awt.*; /** * Atomic rectangle-like semantic shape. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved shape width - * @param height resolved shape height - * @param fillColor optional fill color - * @param stroke optional stroke descriptor - * @param cornerRadius optional render-only corner radius - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved shape width + * @param height resolved shape height + * @param fillColor optional fill color + * @param stroke optional stroke descriptor + * @param cornerRadius optional render-only corner radius + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param transform render-time affine transform (rotation around the - * placement centre and/or scaling); defaults to - * {@link DocumentTransform#NONE}. Layout snapshots stay - * deterministic regardless of rotation/scale — backends - * apply the transform during render only. - * @param fillPaint optional paint fill; when set it wins over - * {@code fillColor}. Gradients render as native shadings in - * the PDF backend; backends without shading support fall - * back to {@link DocumentPaint#primaryColor()}. - * + * @param padding inner padding + * @param margin outer margin + * @param transform render-time affine transform (rotation around the + * placement centre and/or scaling); defaults to + * {@link DocumentTransform#NONE}. Layout snapshots stay + * deterministic regardless of rotation/scale — backends + * apply the transform during render only. + * @param fillPaint optional paint fill; when set it wins over + * {@code fillColor}. Gradients render as native shadings in + * the PDF backend; backends without shading support fall + * back to {@link DocumentPaint#primaryColor()}. * @author Artem Demchyshyn */ public record ShapeNode( @@ -51,17 +45,17 @@ public record ShapeNode( /** * Backwards-compatible canonical constructor without a paint fill. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved shape width - * @param height resolved shape height - * @param fillColor optional fill color - * @param stroke optional stroke descriptor - * @param cornerRadius optional render-only corner radius - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved shape width + * @param height resolved shape height + * @param fillColor optional fill color + * @param stroke optional stroke descriptor + * @param cornerRadius optional render-only corner radius + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin - * @param transform render-time affine transform + * @param padding inner padding + * @param margin outer margin + * @param transform render-time affine transform */ public ShapeNode(String name, double width, @@ -98,13 +92,13 @@ public ShapeNode(String name, /** * Backward-compatible convenience constructor without link/bookmark metadata. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved shape width - * @param height resolved shape height + * @param name node name used in snapshots and layout graph paths + * @param width resolved shape width + * @param height resolved shape height * @param fillColor optional fill color - * @param stroke optional stroke descriptor - * @param padding inner padding - * @param margin outer margin + * @param stroke optional stroke descriptor + * @param padding inner padding + * @param margin outer margin */ public ShapeNode(String name, double width, @@ -120,15 +114,15 @@ public ShapeNode(String name, /** * Backward-compatible convenience constructor without corner radius. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved shape width - * @param height resolved shape height - * @param fillColor optional fill color - * @param stroke optional stroke descriptor - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved shape width + * @param height resolved shape height + * @param fillColor optional fill color + * @param stroke optional stroke descriptor + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ShapeNode(String name, double width, @@ -146,16 +140,16 @@ public ShapeNode(String name, * Backward-compatible convenience constructor without transform — defaults * to {@link DocumentTransform#NONE}. * - * @param name node name used in snapshots and layout graph paths - * @param width resolved shape width - * @param height resolved shape height - * @param fillColor optional fill color - * @param stroke optional stroke descriptor - * @param cornerRadius optional render-only corner radius - * @param linkOptions optional node-level link metadata + * @param name node name used in snapshots and layout graph paths + * @param width resolved shape width + * @param height resolved shape height + * @param fillColor optional fill color + * @param stroke optional stroke descriptor + * @param cornerRadius optional render-only corner radius + * @param linkOptions optional node-level link metadata * @param bookmarkOptions optional node-level bookmark metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin */ public ShapeNode(String name, double width, diff --git a/src/main/java/com/demcha/compose/document/node/SpacerNode.java b/src/main/java/com/demcha/compose/document/node/SpacerNode.java index 538a9f93c..b643b83c9 100644 --- a/src/main/java/com/demcha/compose/document/node/SpacerNode.java +++ b/src/main/java/com/demcha/compose/document/node/SpacerNode.java @@ -5,11 +5,11 @@ /** * Invisible fixed-size semantic spacer. * - * @param name node name used in snapshots and layout graph paths - * @param width spacer width contribution - * @param height spacer height contribution + * @param name node name used in snapshots and layout graph paths + * @param width spacer width contribution + * @param height spacer height contribution * @param padding inner padding - * @param margin outer margin + * @param margin outer margin * @author Artem Demchyshyn */ public record SpacerNode( diff --git a/src/main/java/com/demcha/compose/document/node/TableNode.java b/src/main/java/com/demcha/compose/document/node/TableNode.java index 671078c3a..7c86bf021 100644 --- a/src/main/java/com/demcha/compose/document/node/TableNode.java +++ b/src/main/java/com/demcha/compose/document/node/TableNode.java @@ -1,7 +1,5 @@ package com.demcha.compose.document.node; -import com.demcha.compose.document.node.DocumentBookmarkOptions; -import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.table.DocumentTableCell; import com.demcha.compose.document.table.DocumentTableColumn; @@ -15,17 +13,17 @@ /** * Semantic table node with row-atomic pagination. * - * @param name table node name used in snapshots and layout graph paths - * @param columns negotiated table columns - * @param rows table rows in source order - * @param defaultCellStyle default style applied to cells without overrides - * @param rowStyles row-specific style overrides - * @param columnStyles column-specific style overrides - * @param width optional explicit table width - * @param linkOptions optional node-level link metadata - * @param bookmarkOptions optional node-level bookmark metadata - * @param padding outer table padding - * @param margin outer table margin + * @param name table node name used in snapshots and layout graph paths + * @param columns negotiated table columns + * @param rows table rows in source order + * @param defaultCellStyle default style applied to cells without overrides + * @param rowStyles row-specific style overrides + * @param columnStyles column-specific style overrides + * @param width optional explicit table width + * @param linkOptions optional node-level link metadata + * @param bookmarkOptions optional node-level bookmark metadata + * @param padding outer table padding + * @param margin outer table margin * @param repeatedHeaderRowCount number of leading rows to repeat at the * top of every continuation page when the * table is split across pages; {@code 0} @@ -50,13 +48,13 @@ public record TableNode( * authoring shape for callers that do not need row-level or column-level * style overrides. * - * @param name table node name used in snapshots and layout graph paths - * @param columns negotiated table columns - * @param rows table rows in source order + * @param name table node name used in snapshots and layout graph paths + * @param columns negotiated table columns + * @param rows table rows in source order * @param defaultCellStyle default cell style applied to every cell - * @param width optional explicit table width - * @param padding outer table padding - * @param margin outer table margin + * @param width optional explicit table width + * @param padding outer table padding + * @param margin outer table margin */ public TableNode(String name, List columns, @@ -72,15 +70,15 @@ public TableNode(String name, * Backward-compatible constructor that retains row and column style * overrides without content-scoped PDF metadata. * - * @param name table node name used in snapshots and layout graph paths - * @param columns negotiated table columns - * @param rows table rows in source order + * @param name table node name used in snapshots and layout graph paths + * @param columns negotiated table columns + * @param rows table rows in source order * @param defaultCellStyle default cell style applied to every cell - * @param rowStyles row-specific style overrides - * @param columnStyles column-specific style overrides - * @param width optional explicit table width - * @param padding outer table padding - * @param margin outer table margin + * @param rowStyles row-specific style overrides + * @param columnStyles column-specific style overrides + * @param width optional explicit table width + * @param padding outer table padding + * @param margin outer table margin */ public TableNode(String name, List columns, @@ -98,17 +96,17 @@ public TableNode(String name, * Backward-compatible 11-arg constructor (pre-Phase D.3) that defaults * {@code repeatedHeaderRowCount} to {@code 0}. * - * @param name table node name used in snapshots and layout graph paths - * @param columns negotiated table columns - * @param rows table rows in source order + * @param name table node name used in snapshots and layout graph paths + * @param columns negotiated table columns + * @param rows table rows in source order * @param defaultCellStyle default cell style applied to every cell - * @param rowStyles row-specific style overrides - * @param columnStyles column-specific style overrides - * @param width optional explicit table width - * @param linkOptions optional node-level link metadata - * @param bookmarkOptions optional node-level bookmark metadata - * @param padding outer table padding - * @param margin outer table margin + * @param rowStyles row-specific style overrides + * @param columnStyles column-specific style overrides + * @param width optional explicit table width + * @param linkOptions optional node-level link metadata + * @param bookmarkOptions optional node-level bookmark metadata + * @param padding outer table padding + * @param margin outer table margin */ public TableNode(String name, List columns, @@ -150,7 +148,7 @@ public TableNode(String name, if (repeatedHeaderRowCount > rows.size()) { throw new IllegalArgumentException( "repeatedHeaderRowCount " + repeatedHeaderRowCount - + " exceeds row count " + rows.size() + "."); + + " exceeds row count " + rows.size() + "."); } } diff --git a/src/main/java/com/demcha/compose/document/node/TextVerticalAlign.java b/src/main/java/com/demcha/compose/document/node/TextVerticalAlign.java index d9352c41c..f10f15359 100644 --- a/src/main/java/com/demcha/compose/document/node/TextVerticalAlign.java +++ b/src/main/java/com/demcha/compose/document/node/TextVerticalAlign.java @@ -21,13 +21,19 @@ */ public enum TextVerticalAlign { - /** Engine default baseline seating — unchanged from pre-1.7.0 behaviour. */ + /** + * Engine default baseline seating — unchanged from pre-1.7.0 behaviour. + */ DEFAULT, - /** Seat the cap top at the top of the line box (text hugs the top). */ + /** + * Seat the cap top at the top of the line box (text hugs the top). + */ TOP, - /** Optically centre the text by cap height within its line box. */ + /** + * Optically centre the text by cap height within its line box. + */ CENTER, /** diff --git a/src/main/java/com/demcha/compose/document/output/DocumentHeaderFooterZone.java b/src/main/java/com/demcha/compose/document/output/DocumentHeaderFooterZone.java index b8b3b983b..115fe135e 100644 --- a/src/main/java/com/demcha/compose/document/output/DocumentHeaderFooterZone.java +++ b/src/main/java/com/demcha/compose/document/output/DocumentHeaderFooterZone.java @@ -6,8 +6,12 @@ * @author Artem Demchyshyn */ public enum DocumentHeaderFooterZone { - /** Top-of-page header zone. */ + /** + * Top-of-page header zone. + */ HEADER, - /** Bottom-of-page footer zone. */ + /** + * Bottom-of-page footer zone. + */ FOOTER } diff --git a/src/main/java/com/demcha/compose/document/output/DocumentOutputOptions.java b/src/main/java/com/demcha/compose/document/output/DocumentOutputOptions.java index 6324891dd..36143b295 100644 --- a/src/main/java/com/demcha/compose/document/output/DocumentOutputOptions.java +++ b/src/main/java/com/demcha/compose/document/output/DocumentOutputOptions.java @@ -12,11 +12,10 @@ * into their native representations; backends that cannot honour a particular * option simply ignore it.

* - * @param metadata document information (title, author, ...) - * @param watermark optional document-wide watermark - * @param protection optional access protection + * @param metadata document information (title, author, ...) + * @param watermark optional document-wide watermark + * @param protection optional access protection * @param headersAndFooters repeating header/footer entries - * * @author Artem Demchyshyn */ public record DocumentOutputOptions( @@ -25,7 +24,9 @@ public record DocumentOutputOptions( DocumentProtection protection, List headersAndFooters ) { - /** All-empty defaults. */ + /** + * All-empty defaults. + */ public static final DocumentOutputOptions EMPTY = new DocumentOutputOptions(null, null, null, List.of()); /** diff --git a/src/main/java/com/demcha/compose/document/output/DocumentWatermarkLayer.java b/src/main/java/com/demcha/compose/document/output/DocumentWatermarkLayer.java index 5b35b57e5..6c04140e7 100644 --- a/src/main/java/com/demcha/compose/document/output/DocumentWatermarkLayer.java +++ b/src/main/java/com/demcha/compose/document/output/DocumentWatermarkLayer.java @@ -6,8 +6,12 @@ * @author Artem Demchyshyn */ public enum DocumentWatermarkLayer { - /** Watermark renders behind page content. */ + /** + * Watermark renders behind page content. + */ BEHIND_CONTENT, - /** Watermark renders on top of page content. */ + /** + * Watermark renders on top of page content. + */ ABOVE_CONTENT } diff --git a/src/main/java/com/demcha/compose/document/output/DocumentWatermarkPosition.java b/src/main/java/com/demcha/compose/document/output/DocumentWatermarkPosition.java index 02189f794..f83a0ebea 100644 --- a/src/main/java/com/demcha/compose/document/output/DocumentWatermarkPosition.java +++ b/src/main/java/com/demcha/compose/document/output/DocumentWatermarkPosition.java @@ -8,16 +8,28 @@ * @author Artem Demchyshyn */ public enum DocumentWatermarkPosition { - /** Single watermark centred on the page. */ + /** + * Single watermark centred on the page. + */ CENTER, - /** Single watermark anchored to the top-left corner. */ + /** + * Single watermark anchored to the top-left corner. + */ TOP_LEFT, - /** Single watermark anchored to the top-right corner. */ + /** + * Single watermark anchored to the top-right corner. + */ TOP_RIGHT, - /** Single watermark anchored to the bottom-left corner. */ + /** + * Single watermark anchored to the bottom-left corner. + */ BOTTOM_LEFT, - /** Single watermark anchored to the bottom-right corner. */ + /** + * Single watermark anchored to the bottom-right corner. + */ BOTTOM_RIGHT, - /** Repeated tiled watermark pattern across the page. */ + /** + * Repeated tiled watermark pattern across the page. + */ TILE } diff --git a/src/main/java/com/demcha/compose/document/snapshot/LayoutCanvasSnapshot.java b/src/main/java/com/demcha/compose/document/snapshot/LayoutCanvasSnapshot.java index 1541f6646..75ced682b 100644 --- a/src/main/java/com/demcha/compose/document/snapshot/LayoutCanvasSnapshot.java +++ b/src/main/java/com/demcha/compose/document/snapshot/LayoutCanvasSnapshot.java @@ -3,11 +3,11 @@ /** * Snapshot-friendly projection of the resolved document canvas. * - * @param pageWidth full page width - * @param pageHeight full page height - * @param innerWidth drawable width after margins + * @param pageWidth full page width + * @param pageHeight full page height + * @param innerWidth drawable width after margins * @param innerHeight drawable height after margins - * @param margin resolved canvas margin + * @param margin resolved canvas margin */ public record LayoutCanvasSnapshot( double pageWidth, diff --git a/src/main/java/com/demcha/compose/document/snapshot/LayoutInsetsSnapshot.java b/src/main/java/com/demcha/compose/document/snapshot/LayoutInsetsSnapshot.java index 9cca8d088..0ce11cd97 100644 --- a/src/main/java/com/demcha/compose/document/snapshot/LayoutInsetsSnapshot.java +++ b/src/main/java/com/demcha/compose/document/snapshot/LayoutInsetsSnapshot.java @@ -3,10 +3,10 @@ /** * Snapshot-friendly inset model used for margins and padding. * - * @param top top inset - * @param right right inset + * @param top top inset + * @param right right inset * @param bottom bottom inset - * @param left left inset + * @param left left inset */ public record LayoutInsetsSnapshot(double top, double right, double bottom, double left) { } diff --git a/src/main/java/com/demcha/compose/document/snapshot/LayoutNodeSnapshot.java b/src/main/java/com/demcha/compose/document/snapshot/LayoutNodeSnapshot.java index fe3751476..cbb295edd 100644 --- a/src/main/java/com/demcha/compose/document/snapshot/LayoutNodeSnapshot.java +++ b/src/main/java/com/demcha/compose/document/snapshot/LayoutNodeSnapshot.java @@ -3,25 +3,25 @@ /** * Stable, test-oriented projection of a single resolved document node. * - * @param path full deterministic node path built from parent path and local segment - * @param entityName semantic entity name when available, otherwise {@code null} - * @param entityKind stable node kind used as a fallback identity hint - * @param parentPath full parent path, or {@code null} for root nodes - * @param childIndex zero-based position among siblings - * @param depth resolved tree depth for debugging and ordering checks - * @param layer resolved layer value after layout - * @param computedX resolved computed x-coordinate - * @param computedY resolved computed y-coordinate - * @param placementX resolved placement box x-coordinate - * @param placementY resolved placement box y-coordinate - * @param placementWidth resolved placement box width + * @param path full deterministic node path built from parent path and local segment + * @param entityName semantic entity name when available, otherwise {@code null} + * @param entityKind stable node kind used as a fallback identity hint + * @param parentPath full parent path, or {@code null} for root nodes + * @param childIndex zero-based position among siblings + * @param depth resolved tree depth for debugging and ordering checks + * @param layer resolved layer value after layout + * @param computedX resolved computed x-coordinate + * @param computedY resolved computed y-coordinate + * @param placementX resolved placement box x-coordinate + * @param placementY resolved placement box y-coordinate + * @param placementWidth resolved placement box width * @param placementHeight resolved placement box height - * @param startPage zero-based first page touched by this node - * @param endPage zero-based last page touched by this node - * @param contentWidth resolved content width - * @param contentHeight resolved content height - * @param margin normalized margin insets captured for debugging - * @param padding normalized padding insets captured for debugging + * @param startPage zero-based first page touched by this node + * @param endPage zero-based last page touched by this node + * @param contentWidth resolved content width + * @param contentHeight resolved content height + * @param margin normalized margin insets captured for debugging + * @param padding normalized padding insets captured for debugging */ public record LayoutNodeSnapshot( String path, diff --git a/src/main/java/com/demcha/compose/document/snapshot/LayoutSnapshot.java b/src/main/java/com/demcha/compose/document/snapshot/LayoutSnapshot.java index 13c68b582..87cc778f3 100644 --- a/src/main/java/com/demcha/compose/document/snapshot/LayoutSnapshot.java +++ b/src/main/java/com/demcha/compose/document/snapshot/LayoutSnapshot.java @@ -10,9 +10,9 @@ * stable layout state so JSON baselines stay readable and maintainable.

* * @param formatVersion snapshot schema version used to interpret the JSON shape - * @param canvas resolved canvas metadata for the composed document - * @param totalPages total number of pages touched by the resolved layout - * @param nodes deterministic depth-first list of resolved document nodes + * @param canvas resolved canvas metadata for the composed document + * @param totalPages total number of pages touched by the resolved layout + * @param nodes deterministic depth-first list of resolved document nodes */ public record LayoutSnapshot( String formatVersion, diff --git a/src/main/java/com/demcha/compose/document/style/DocumentBorders.java b/src/main/java/com/demcha/compose/document/style/DocumentBorders.java index cbb5e0ea6..d02ef9c83 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentBorders.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentBorders.java @@ -9,15 +9,16 @@ * bottom-only divider under a row) without importing internal engine shape * components.

* - * @param top stroke applied to the top side, or {@code null} for none - * @param right stroke applied to the right side, or {@code null} for none + * @param top stroke applied to the top side, or {@code null} for none + * @param right stroke applied to the right side, or {@code null} for none * @param bottom stroke applied to the bottom side, or {@code null} for none - * @param left stroke applied to the left side, or {@code null} for none - * + * @param left stroke applied to the left side, or {@code null} for none * @author Artem Demchyshyn */ public record DocumentBorders(DocumentStroke top, DocumentStroke right, DocumentStroke bottom, DocumentStroke left) { - /** All-sides empty borders. */ + /** + * All-sides empty borders. + */ public static final DocumentBorders NONE = new DocumentBorders(null, null, null, null); /** diff --git a/src/main/java/com/demcha/compose/document/style/DocumentColor.java b/src/main/java/com/demcha/compose/document/style/DocumentColor.java index 1207f321c..7b1aab610 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentColor.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentColor.java @@ -1,6 +1,6 @@ package com.demcha.compose.document.style; -import java.awt.Color; +import java.awt.*; import java.util.Objects; /** @@ -61,9 +61,9 @@ public static DocumentColor of(Color color) { /** * Creates a document color from RGB components. * - * @param red red channel from 0 to 255 + * @param red red channel from 0 to 255 * @param green green channel from 0 to 255 - * @param blue blue channel from 0 to 255 + * @param blue blue channel from 0 to 255 * @return immutable document color */ public static DocumentColor rgb(int red, int green, int blue) { @@ -79,9 +79,9 @@ public static DocumentColor rgb(int red, int green, int blue) { * constant. Text, lines, and the DOCX backend currently render the colour * fully opaque.

* - * @param red red channel from 0 to 255 + * @param red red channel from 0 to 255 * @param green green channel from 0 to 255 - * @param blue blue channel from 0 to 255 + * @param blue blue channel from 0 to 255 * @param alpha alpha channel from 0 (transparent) to 255 (opaque) * @return immutable document color * @since 1.8.0 diff --git a/src/main/java/com/demcha/compose/document/style/DocumentCornerRadius.java b/src/main/java/com/demcha/compose/document/style/DocumentCornerRadius.java index 5d68b6e5e..4c1e71c47 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentCornerRadius.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentCornerRadius.java @@ -19,11 +19,10 @@ * need asymmetry use the four-arg form or one of the convenience * helpers below.

* - * @param topLeft top-left radius in points - * @param topRight top-right radius in points + * @param topLeft top-left radius in points + * @param topRight top-right radius in points * @param bottomRight bottom-right radius in points - * @param bottomLeft bottom-left radius in points - * + * @param bottomLeft bottom-left radius in points * @author Artem Demchyshyn */ public record DocumentCornerRadius(double topLeft, double topRight, double bottomRight, double bottomLeft) { @@ -66,10 +65,10 @@ public static DocumentCornerRadius of(double radius) { * Creates a corner radius with explicit values per corner. Order * matches CSS-style top-left, top-right, bottom-right, bottom-left. * - * @param topLeft top-left radius - * @param topRight top-right radius + * @param topLeft top-left radius + * @param topRight top-right radius * @param bottomRight bottom-right radius - * @param bottomLeft bottom-left radius + * @param bottomLeft bottom-left radius * @return per-corner radius */ public static DocumentCornerRadius of(double topLeft, double topRight, double bottomRight, double bottomLeft) { diff --git a/src/main/java/com/demcha/compose/document/style/DocumentDashPattern.java b/src/main/java/com/demcha/compose/document/style/DocumentDashPattern.java index cdd2cd465..8f400f6e5 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentDashPattern.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentDashPattern.java @@ -22,7 +22,9 @@ */ public record DocumentDashPattern(List segments) { - /** Solid (un-dashed) stroke — the default for every line. */ + /** + * Solid (un-dashed) stroke — the default for every line. + */ public static final DocumentDashPattern NONE = new DocumentDashPattern(List.of()); /** diff --git a/src/main/java/com/demcha/compose/document/style/DocumentInsets.java b/src/main/java/com/demcha/compose/document/style/DocumentInsets.java index 735a940f1..2b4365d68 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentInsets.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentInsets.java @@ -7,10 +7,10 @@ * document spacing without importing low-level engine components. Instances are * immutable and thread-safe.

* - * @param top top inset in points - * @param right right inset in points + * @param top top inset in points + * @param right right inset in points * @param bottom bottom inset in points - * @param left left inset in points + * @param left left inset in points * @author Artem Demchyshyn */ public record DocumentInsets(double top, double right, double bottom, double left) { @@ -37,7 +37,7 @@ public static DocumentInsets of(double value) { /** * Creates spacing from vertical and horizontal values. * - * @param vertical top and bottom inset in points + * @param vertical top and bottom inset in points * @param horizontal left and right inset in points * @return symmetric insets */ diff --git a/src/main/java/com/demcha/compose/document/style/DocumentPaint.java b/src/main/java/com/demcha/compose/document/style/DocumentPaint.java index 209761540..034629a9c 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentPaint.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentPaint.java @@ -40,7 +40,7 @@ static DocumentPaint solid(DocumentColor color) { * Two-stop linear gradient along a normalized angle (0 = left→right). * * @param from start colour - * @param to end colour + * @param to end colour * @return linear paint */ static DocumentPaint linear(DocumentColor from, DocumentColor to) { @@ -53,12 +53,15 @@ static DocumentPaint linear(DocumentColor from, DocumentColor to) { * @param color fill colour */ record Solid(DocumentColor color) implements DocumentPaint { - /** Validates the colour. */ + /** + * Validates the colour. + */ public Solid { Objects.requireNonNull(color, "color"); } - @Override public DocumentColor primaryColor() { + @Override + public DocumentColor primaryColor() { return color; } } @@ -66,11 +69,13 @@ record Solid(DocumentColor color) implements DocumentPaint { /** * Linear gradient. * - * @param stops ordered colour stops, offsets in [0,1]; at least two + * @param stops ordered colour stops, offsets in [0,1]; at least two * @param angleDegrees gradient direction, 0 = left→right, 90 = bottom→top */ record Linear(List stops, double angleDegrees) implements DocumentPaint { - /** Copy-protects and validates stops. */ + /** + * Copy-protects and validates stops. + */ public Linear { Objects.requireNonNull(stops, "stops"); stops = List.copyOf(stops); @@ -79,7 +84,8 @@ record Linear(List stops, double angleDegrees) implements DocumentPaint { } } - @Override public DocumentColor primaryColor() { + @Override + public DocumentColor primaryColor() { return stops.get(0).color(); } } @@ -88,11 +94,13 @@ record Linear(List stops, double angleDegrees) implements DocumentPaint { * Radial gradient from a normalized centre outward. * * @param stops ordered colour stops, offsets in [0,1]; at least two - * @param cx normalized centre x in [0,1] - * @param cy normalized centre y in [0,1] + * @param cx normalized centre x in [0,1] + * @param cy normalized centre y in [0,1] */ record Radial(List stops, double cx, double cy) implements DocumentPaint { - /** Copy-protects and validates stops. */ + /** + * Copy-protects and validates stops. + */ public Radial { Objects.requireNonNull(stops, "stops"); stops = List.copyOf(stops); @@ -101,7 +109,8 @@ record Radial(List stops, double cx, double cy) implements DocumentPaint { } } - @Override public DocumentColor primaryColor() { + @Override + public DocumentColor primaryColor() { return stops.get(0).color(); } } @@ -110,10 +119,12 @@ record Radial(List stops, double cx, double cy) implements DocumentPaint { * One gradient colour stop. * * @param offset position along the gradient axis in [0,1] - * @param color colour at this offset + * @param color colour at this offset */ record Stop(double offset, DocumentColor color) { - /** Validates the offset and colour. */ + /** + * Validates the offset and colour. + */ public Stop { if (offset < 0 || offset > 1 || Double.isNaN(offset)) { throw new IllegalArgumentException("stop offset must be in [0,1]: " + offset); diff --git a/src/main/java/com/demcha/compose/document/style/DocumentTextAutoSize.java b/src/main/java/com/demcha/compose/document/style/DocumentTextAutoSize.java index 032f6fbf7..402369219 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentTextAutoSize.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentTextAutoSize.java @@ -11,8 +11,7 @@ * * @param maxSize upper bound for the resolved font size in points * @param minSize lower bound for the resolved font size in points - * @param step search step in points (rounded down to a positive value) - * + * @param step search step in points (rounded down to a positive value) * @author Artem Demchyshyn */ public record DocumentTextAutoSize(double maxSize, double minSize, double step) { diff --git a/src/main/java/com/demcha/compose/document/style/DocumentTextStyle.java b/src/main/java/com/demcha/compose/document/style/DocumentTextStyle.java index af7d50ee3..f3c891d6e 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentTextStyle.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentTextStyle.java @@ -10,10 +10,10 @@ *

The DSL adapts this value into the internal engine text style during * composition. Instances are immutable and thread-safe.

* - * @param fontName font family name - * @param size font size in points + * @param fontName font family name + * @param size font size in points * @param decoration text decoration - * @param color text color + * @param color text color * @author Artem Demchyshyn */ public record DocumentTextStyle( diff --git a/src/main/java/com/demcha/compose/document/style/DocumentTransform.java b/src/main/java/com/demcha/compose/document/style/DocumentTransform.java index a537c5d50..83568e954 100644 --- a/src/main/java/com/demcha/compose/document/style/DocumentTransform.java +++ b/src/main/java/com/demcha/compose/document/style/DocumentTransform.java @@ -22,14 +22,15 @@ * * * @param rotationDegrees clockwise rotation in degrees - * @param scaleX horizontal scale factor (must be finite, non-zero) - * @param scaleY vertical scale factor (must be finite, non-zero) - * + * @param scaleX horizontal scale factor (must be finite, non-zero) + * @param scaleY vertical scale factor (must be finite, non-zero) * @author Artem Demchyshyn */ public record DocumentTransform(double rotationDegrees, double scaleX, double scaleY) { - /** Identity transform — no rotation, no scaling. */ + /** + * Identity transform — no rotation, no scaling. + */ public static final DocumentTransform NONE = new DocumentTransform(0.0, 1.0, 1.0); /** @@ -108,8 +109,8 @@ public DocumentTransform withScale(double scaleX, double scaleY) { * Reports whether this transform is the identity. * * @return {@code true} when the transform is the identity (no - * rotation, no scaling); backends may skip CTM push/pop - * when this is the case + * rotation, no scaling); backends may skip CTM push/pop + * when this is the case */ public boolean isIdentity() { return rotationDegrees == 0.0 && scaleX == 1.0 && scaleY == 1.0; diff --git a/src/main/java/com/demcha/compose/document/style/ShapeOutline.java b/src/main/java/com/demcha/compose/document/style/ShapeOutline.java index 308c41aaf..94a297cd1 100644 --- a/src/main/java/com/demcha/compose/document/style/ShapeOutline.java +++ b/src/main/java/com/demcha/compose/document/style/ShapeOutline.java @@ -39,7 +39,7 @@ public sealed interface ShapeOutline permits /** * Plain axis-aligned rectangle outline. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points */ record Rectangle(double width, double height) implements ShapeOutline { @@ -56,8 +56,8 @@ record Rectangle(double width, double height) implements ShapeOutline { * Rectangle with a uniform corner radius. Render code may further clamp * {@code cornerRadius} to half of the smaller side at draw time. * - * @param width outer width in points - * @param height outer height in points + * @param width outer width in points + * @param height outer height in points * @param cornerRadius corner radius in points (0 means square corners) */ record RoundedRectangle(double width, double height, double cornerRadius) implements ShapeOutline { @@ -80,8 +80,8 @@ record RoundedRectangle(double width, double height, double cornerRadius) implem * {@link DocumentCornerRadius#right(double)} for a card that sits flush * against a left edge — without a CLIP_PATH parent workaround. * - * @param width outer width in points - * @param height outer height in points + * @param width outer width in points + * @param height outer height in points * @param corners per-corner radii * @since 1.7.0 */ @@ -100,7 +100,7 @@ record RoundedRectanglePerCorner(double width, double height, DocumentCornerRadi /** * Ellipse outline. A circle is just an ellipse with {@code width == height}. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points */ record Ellipse(double width, double height) implements ShapeOutline { @@ -120,7 +120,7 @@ record Ellipse(double width, double height) implements ShapeOutline { * size. Diamonds, triangles, stars and arbitrary convex/concave polygons * are all expressed through this single kind via the factories below. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @param points ring of at least three normalized vertices, in draw order * @since 1.7.0 @@ -146,13 +146,21 @@ record Polygon(double width, double height, List points) implements * @since 1.7.0 */ enum Direction { - /** Pointing right. */ + /** + * Pointing right. + */ RIGHT, - /** Pointing left. */ + /** + * Pointing left. + */ LEFT, - /** Pointing up. */ + /** + * Pointing up. + */ UP, - /** Pointing down. */ + /** + * Pointing down. + */ DOWN } @@ -166,9 +174,13 @@ enum Direction { * @since 1.7.0 */ enum CheckmarkStyle { - /** The default tick: a slim six-vertex checkmark band. */ + /** + * The default tick: a slim six-vertex checkmark band. + */ CLASSIC, - /** A bolder tick with a visibly thicker band. */ + /** + * A bolder tick with a visibly thicker band. + */ HEAVY } @@ -181,9 +193,13 @@ enum CheckmarkStyle { * @since 1.7.0 */ enum ArrowStyle { - /** The default arrow: a seven-vertex block arrow with a shaft. */ + /** + * The default arrow: a seven-vertex block arrow with a shaft. + */ BLOCK, - /** A solid triangular arrowhead ("▶") with no shaft. */ + /** + * A solid triangular arrowhead ("▶") with no shaft. + */ TRIANGLE } @@ -200,7 +216,7 @@ static Ellipse circle(double diameter) { /** * Creates a {@link Polygon} from an explicit ring of normalized vertices. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @param points ring of at least three normalized vertices, in draw order * @return polygon outline @@ -212,7 +228,7 @@ static Polygon polygon(double width, double height, List points) { /** * Creates a four-point diamond (rhombus) inscribed in the box. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @return diamond polygon outline */ @@ -227,7 +243,7 @@ static Polygon diamond(double width, double height) { /** * Creates an upward-pointing triangle inscribed in the box. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @return triangle polygon outline */ @@ -241,7 +257,7 @@ static Polygon triangle(double width, double height) { /** * Creates a five-pointed star inscribed in the box. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @return five-pointed star polygon outline */ @@ -253,7 +269,7 @@ static Polygon star(double width, double height) { * Creates an {@code n}-pointed star inscribed in the box, with the first * point facing up. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @param points number of outer points (at least 3) * @return star polygon outline @@ -287,8 +303,8 @@ static Polygon star(double width, double height, int points) { * Creates a block arrow pointing in {@code direction} — a list bullet or an * inline marker between text ("Step 1 → Step 2"). * - * @param width outer width in points - * @param height outer height in points + * @param width outer width in points + * @param height outer height in points * @param direction the way the arrow points * @return arrow polygon outline */ @@ -301,10 +317,10 @@ static Polygon arrow(double width, double height, Direction direction) { * {@code direction} — the swappable-design overload. {@link ArrowStyle#BLOCK} * reproduces {@link #arrow(double, double, Direction)} exactly. * - * @param width outer width in points - * @param height outer height in points + * @param width outer width in points + * @param height outer height in points * @param direction the way the arrow points - * @param style the arrow design + * @param style the arrow design * @return arrow polygon outline * @since 1.7.0 */ @@ -312,11 +328,11 @@ static Polygon arrow(double width, double height, Direction direction, ArrowStyl Objects.requireNonNull(direction, "direction"); Objects.requireNonNull(style, "style"); double[][] base = switch (style) { - case BLOCK -> new double[][] { + case BLOCK -> new double[][]{ {0.00, 0.65}, {0.55, 0.65}, {0.55, 0.88}, {1.00, 0.50}, {0.55, 0.12}, {0.55, 0.35}, {0.00, 0.35} }; - case TRIANGLE -> new double[][] { + case TRIANGLE -> new double[][]{ {0.00, 0.00}, {1.00, 0.50}, {0.00, 1.00} }; }; @@ -326,7 +342,7 @@ static Polygon arrow(double width, double height, Direction direction, ArrowStyl /** * Creates a right-pointing block arrow. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @return right arrow polygon outline */ @@ -337,7 +353,7 @@ static Polygon arrowRight(double width, double height) { /** * Creates a left-pointing block arrow. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @return left arrow polygon outline */ @@ -349,8 +365,8 @@ static Polygon arrowLeft(double width, double height) { * Creates a chevron ("›") pointing in {@code direction} — a lighter * directional marker for breadcrumbs and step lists. * - * @param width outer width in points - * @param height outer height in points + * @param width outer width in points + * @param height outer height in points * @param direction the way the chevron points * @return chevron polygon outline */ @@ -367,7 +383,7 @@ static Polygon chevron(double width, double height, Direction direction) { /** * Creates a checkmark ("✓") figure for "done" items in checklists. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @return checkmark polygon outline */ @@ -380,16 +396,16 @@ static Polygon checkmark(double width, double height) { * swappable-design overload. {@link CheckmarkStyle#CLASSIC} reproduces * {@link #checkmark(double, double)} exactly. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points - * @param style the checkmark design + * @param style the checkmark design * @return checkmark polygon outline * @since 1.7.0 */ static Polygon checkmark(double width, double height, CheckmarkStyle style) { Objects.requireNonNull(style, "style"); List ring = switch (style) { - case CLASSIC -> toPoints(new double[][] { + case CLASSIC -> toPoints(new double[][]{ {0.45, 0.00}, {1.00, 0.72}, {0.86, 0.92}, {0.42, 0.34}, {0.16, 0.58}, {0.04, 0.44} }); @@ -401,7 +417,7 @@ static Polygon checkmark(double width, double height, CheckmarkStyle style) { /** * Creates a plus ("+") figure for "add" affordances or checklist markers. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points * @return plus polygon outline */ @@ -420,9 +436,9 @@ static Polygon plus(double width, double height) { * Creates a regular {@code sides}-gon (pentagon, hexagon, …) inscribed in * the box, with the first vertex facing up. * - * @param width outer width in points + * @param width outer width in points * @param height outer height in points - * @param sides number of sides (at least 3) + * @param sides number of sides (at least 3) * @return regular polygon outline */ static Polygon regularPolygon(double width, double height, int sides) { diff --git a/src/main/java/com/demcha/compose/document/style/ShapeRings.java b/src/main/java/com/demcha/compose/document/style/ShapeRings.java index 3b5416a56..2131ad52c 100644 --- a/src/main/java/com/demcha/compose/document/style/ShapeRings.java +++ b/src/main/java/com/demcha/compose/document/style/ShapeRings.java @@ -22,7 +22,7 @@ private ShapeRings() { * * @param half perpendicular half-thickness of the band, in unit-box units * @return six ring vertices in draw order: outer elbow, right tip (outer then - * inner), inner elbow, left tip (inner then outer) + * inner), inner elbow, left tip (inner then outer) */ static double[][] checkmarkBand(double half) { double[] left = {0.12, 0.50}; @@ -34,7 +34,7 @@ static double[][] checkmarkBand(double half) { double[] normalLeft = outwardNormal(toLeft); double[] bisector = unit(normalRight[0] + normalLeft[0], normalRight[1] + normalLeft[1]); double miter = half / (bisector[0] * normalRight[0] + bisector[1] * normalRight[1]); - return new double[][] { + return new double[][]{ {elbow[0] + bisector[0] * miter, elbow[1] + bisector[1] * miter}, // outer elbow {right[0] + normalRight[0] * half, right[1] + normalRight[1] * half}, // right tip, outer {right[0] - normalRight[0] * half, right[1] - normalRight[1] * half}, // right tip, inner @@ -44,19 +44,23 @@ static double[][] checkmarkBand(double half) { }; } - /** Returns the unit vector along {@code (x, y)}, or the zero vector for zero length. */ + /** + * Returns the unit vector along {@code (x, y)}, or the zero vector for zero length. + */ private static double[] unit(double x, double y) { double length = Math.hypot(x, y); - return length == 0 ? new double[] {0.0, 0.0} : new double[] {x / length, y / length}; + return length == 0 ? new double[]{0.0, 0.0} : new double[]{x / length, y / length}; } - /** Returns the normal of {@code u} flipped to point toward the bottom (convex) side. */ + /** + * Returns the normal of {@code u} flipped to point toward the bottom (convex) side. + */ private static double[] outwardNormal(double[] u) { double nx = u[1]; double ny = -u[0]; if (ny > 0) { - return new double[] {-nx, -ny}; + return new double[]{-nx, -ny}; } - return new double[] {nx, ny}; + return new double[]{nx, ny}; } } diff --git a/src/main/java/com/demcha/compose/document/table/DocumentTableCell.java b/src/main/java/com/demcha/compose/document/table/DocumentTableCell.java index ec2fca54d..6e80623ff 100644 --- a/src/main/java/com/demcha/compose/document/table/DocumentTableCell.java +++ b/src/main/java/com/demcha/compose/document/table/DocumentTableCell.java @@ -31,8 +31,8 @@ * specify the cells that are not yet covered by a prior row's * spanning cell.

* - * @param lines text lines rendered inside the cell when {@code content} is {@code null} - * @param style optional style override + * @param lines text lines rendered inside the cell when {@code content} is {@code null} + * @param style optional style override * @param colSpan number of columns the cell occupies (must be {@code >= 1}) * @param rowSpan number of rows the cell occupies (must be {@code >= 1}) * @param content optional composed child node; when non-null the cell @@ -63,8 +63,8 @@ public record DocumentTableCell( * Backward-compatible 4-arg constructor (v1.4 / v1.5 shape) that * defaults {@code content} to {@code null} (plain-text cell). * - * @param lines text lines rendered inside the cell - * @param style optional style override + * @param lines text lines rendered inside the cell + * @param style optional style override * @param colSpan number of columns the cell occupies (must be {@code >= 1}) * @param rowSpan number of rows the cell occupies (must be {@code >= 1}) */ @@ -77,8 +77,8 @@ public DocumentTableCell(List lines, DocumentTableStyle style, int colSp * {@code rowSpan}. Defaults {@code rowSpan} to {@code 1} and * {@code content} to {@code null}. * - * @param lines text lines rendered inside the cell - * @param style optional style override + * @param lines text lines rendered inside the cell + * @param style optional style override * @param colSpan number of columns the cell occupies (must be {@code >= 1}) */ public DocumentTableCell(List lines, DocumentTableStyle style, int colSpan) { diff --git a/src/main/java/com/demcha/compose/document/table/DocumentTableColumn.java b/src/main/java/com/demcha/compose/document/table/DocumentTableColumn.java index fb7c3bdad..fed08c59b 100644 --- a/src/main/java/com/demcha/compose/document/table/DocumentTableColumn.java +++ b/src/main/java/com/demcha/compose/document/table/DocumentTableColumn.java @@ -6,7 +6,7 @@ *

Use {@link #auto()} for negotiated columns and {@link #fixed(double)} when * a column must reserve a known width. Instances are immutable and thread-safe.

* - * @param type sizing mode + * @param type sizing mode * @param fixedWidth fixed width in points when {@code type} is {@link Type#FIXED} * @author Artem Demchyshyn */ diff --git a/src/main/java/com/demcha/compose/document/templates/api/CoverLetterTemplate.java b/src/main/java/com/demcha/compose/document/templates/api/CoverLetterTemplate.java index 306a26c74..29cb0c226 100644 --- a/src/main/java/com/demcha/compose/document/templates/api/CoverLetterTemplate.java +++ b/src/main/java/com/demcha/compose/document/templates/api/CoverLetterTemplate.java @@ -58,7 +58,7 @@ default String getDescription() { * Composes a cover letter into a live document session. * * @param document active mutable document session receiving template nodes - * @param spec cover-letter document spec + * @param spec cover-letter document spec * @throws NullPointerException if an implementation requires non-null inputs */ void compose(DocumentSession document, CoverLetterDocumentSpec spec); diff --git a/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java b/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java index 0e5134aa1..ccaea6c3d 100644 --- a/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java +++ b/src/main/java/com/demcha/compose/document/templates/api/DocumentTemplate.java @@ -71,10 +71,10 @@ public interface DocumentTemplate { * * @param session active document session to compose into * @param spec domain-specific data populating the template - * @throws NullPointerException if {@code session} or {@code spec} is null + * @throws NullPointerException if {@code session} or {@code spec} is null * @throws IllegalArgumentException if a required slot or module name - * declared by the template cannot be resolved against - * {@code spec} + * declared by the template cannot be resolved against + * {@code spec} */ void compose(DocumentSession session, S spec); } diff --git a/src/main/java/com/demcha/compose/document/templates/api/InvoiceTemplate.java b/src/main/java/com/demcha/compose/document/templates/api/InvoiceTemplate.java index 96ce62fd1..3ec59a3fb 100644 --- a/src/main/java/com/demcha/compose/document/templates/api/InvoiceTemplate.java +++ b/src/main/java/com/demcha/compose/document/templates/api/InvoiceTemplate.java @@ -55,7 +55,7 @@ default String getDescription() { * Composes an invoice into a live document session. * * @param document active mutable document session receiving template nodes - * @param spec invoice document spec + * @param spec invoice document spec * @throws NullPointerException if an implementation requires non-null inputs */ void compose(DocumentSession document, InvoiceDocumentSpec spec); diff --git a/src/main/java/com/demcha/compose/document/templates/api/ProposalTemplate.java b/src/main/java/com/demcha/compose/document/templates/api/ProposalTemplate.java index c9a29dfcf..44e45a514 100644 --- a/src/main/java/com/demcha/compose/document/templates/api/ProposalTemplate.java +++ b/src/main/java/com/demcha/compose/document/templates/api/ProposalTemplate.java @@ -55,7 +55,7 @@ default String getDescription() { * Composes a proposal into a live document session. * * @param document active mutable document session receiving template nodes - * @param spec proposal document spec + * @param spec proposal document spec * @throws NullPointerException if an implementation requires non-null inputs */ void compose(DocumentSession document, ProposalDocumentSpec spec); diff --git a/src/main/java/com/demcha/compose/document/templates/api/SlotMap.java b/src/main/java/com/demcha/compose/document/templates/api/SlotMap.java index 028a41d28..f756c1e97 100644 --- a/src/main/java/com/demcha/compose/document/templates/api/SlotMap.java +++ b/src/main/java/com/demcha/compose/document/templates/api/SlotMap.java @@ -2,12 +2,7 @@ import com.demcha.compose.document.node.DocumentNode; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * Mutable map from slot names to ordered lists of {@link DocumentNode} @@ -85,7 +80,7 @@ public SlotMap addAll(String slot, List nodes) { * * @param slot slot name; may be unknown * @return immutable list of children, or an empty list if the slot - * has no children (or is unknown) + * has no children (or is unknown) */ public List get(String slot) { List children = bySlot.get(slot); diff --git a/src/main/java/com/demcha/compose/document/templates/api/WeeklyScheduleTemplate.java b/src/main/java/com/demcha/compose/document/templates/api/WeeklyScheduleTemplate.java index a85276b0d..bc2ba03e9 100644 --- a/src/main/java/com/demcha/compose/document/templates/api/WeeklyScheduleTemplate.java +++ b/src/main/java/com/demcha/compose/document/templates/api/WeeklyScheduleTemplate.java @@ -55,7 +55,7 @@ default String getDescription() { * Composes a weekly schedule into a live document session. * * @param document active mutable document session receiving template nodes - * @param spec weekly schedule document spec + * @param spec weekly schedule document spec * @throws NullPointerException if an implementation requires non-null inputs */ void compose(DocumentSession document, WeeklyScheduleDocumentSpec spec); diff --git a/src/main/java/com/demcha/compose/document/templates/blocks/Block.java b/src/main/java/com/demcha/compose/document/templates/blocks/Block.java index 049dba6b9..7ea95265f 100644 --- a/src/main/java/com/demcha/compose/document/templates/blocks/Block.java +++ b/src/main/java/com/demcha/compose/document/templates/blocks/Block.java @@ -19,11 +19,11 @@ */ public sealed interface Block permits ParagraphBlock, - BulletListBlock, - NumberedListBlock, - IndentedBlock, - KeyValueBlock, - MultiParagraphBlock, - WorkHistoryBlock, - EducationBlock { + BulletListBlock, + NumberedListBlock, + IndentedBlock, + KeyValueBlock, + MultiParagraphBlock, + WorkHistoryBlock, + EducationBlock { } diff --git a/src/main/java/com/demcha/compose/document/templates/builtins/InvoiceTemplateV2.java b/src/main/java/com/demcha/compose/document/templates/builtins/InvoiceTemplateV2.java index 5559dd544..87fc8894a 100644 --- a/src/main/java/com/demcha/compose/document/templates/builtins/InvoiceTemplateV2.java +++ b/src/main/java/com/demcha/compose/document/templates/builtins/InvoiceTemplateV2.java @@ -2,19 +2,11 @@ import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.TableBuilder; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; import com.demcha.compose.document.templates.api.InvoiceTemplate; -import com.demcha.compose.document.templates.data.invoice.InvoiceData; -import com.demcha.compose.document.templates.data.invoice.InvoiceLineItem; -import com.demcha.compose.document.templates.data.invoice.InvoiceParty; -import com.demcha.compose.document.templates.data.invoice.InvoiceSummaryRow; -import com.demcha.compose.document.templates.data.invoice.InvoiceDocumentSpec; +import com.demcha.compose.document.templates.data.invoice.*; import com.demcha.compose.document.templates.support.common.TemplateLifecycleLog; import com.demcha.compose.document.theme.BusinessTheme; @@ -84,7 +76,7 @@ public String getTemplateName() { @Override public String getDescription() { return "Theme-driven invoice template using soft panels, accent strips, " - + "rich text, zebra rows, and a repeating totals header."; + + "rich text, zebra rows, and a repeating totals header."; } @Override diff --git a/src/main/java/com/demcha/compose/document/templates/builtins/ProposalTemplateV2.java b/src/main/java/com/demcha/compose/document/templates/builtins/ProposalTemplateV2.java index 3a5ad4f76..df2a5372f 100644 --- a/src/main/java/com/demcha/compose/document/templates/builtins/ProposalTemplateV2.java +++ b/src/main/java/com/demcha/compose/document/templates/builtins/ProposalTemplateV2.java @@ -2,20 +2,11 @@ import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.TableBuilder; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; import com.demcha.compose.document.templates.api.ProposalTemplate; -import com.demcha.compose.document.templates.data.proposal.ProposalData; -import com.demcha.compose.document.templates.data.proposal.ProposalDocumentSpec; -import com.demcha.compose.document.templates.data.proposal.ProposalParty; -import com.demcha.compose.document.templates.data.proposal.ProposalPricingRow; -import com.demcha.compose.document.templates.data.proposal.ProposalSection; -import com.demcha.compose.document.templates.data.proposal.ProposalTimelineItem; +import com.demcha.compose.document.templates.data.proposal.*; import com.demcha.compose.document.templates.support.common.TemplateLifecycleLog; import com.demcha.compose.document.theme.BusinessTheme; @@ -85,7 +76,7 @@ public String getTemplateName() { @Override public String getDescription() { return "Theme-driven proposal template using soft panels, accent strips, " - + "themed timeline / pricing tables, and a repeating pricing header."; + + "themed timeline / pricing tables, and a repeating pricing header."; } @Override diff --git a/src/main/java/com/demcha/compose/document/templates/components/Header.java b/src/main/java/com/demcha/compose/document/templates/components/Header.java index 43164a7d8..e4960a85c 100644 --- a/src/main/java/com/demcha/compose/document/templates/components/Header.java +++ b/src/main/java/com/demcha/compose/document/templates/components/Header.java @@ -1,12 +1,6 @@ package com.demcha.compose.document.templates.components; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.InlineRun; -import com.demcha.compose.document.node.InlineTextRun; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.TextAlign; +import com.demcha.compose.document.node.*; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.themes.Spacing; @@ -124,7 +118,7 @@ public Header withLinkStyle(DocumentTextStyle style) { * * @param input header input data * @return container node holding the rendered name, contact, and - * links rows + * links rows * @throws NullPointerException if {@code input} is null */ public DocumentNode compose(Input input) { @@ -171,7 +165,7 @@ private ParagraphNode nameRow(String name) { /* bookmark */ null, /* padding */ DocumentInsets.zero(), /* margin */ new DocumentInsets( - 0.0, 0.0, spacing.headerLineSpacing(), 0.0), + 0.0, 0.0, spacing.headerLineSpacing(), 0.0), /* autoSize */ null); } diff --git a/src/main/java/com/demcha/compose/document/templates/components/MarkdownText.java b/src/main/java/com/demcha/compose/document/templates/components/MarkdownText.java index b25fb6642..88c3275fd 100644 --- a/src/main/java/com/demcha/compose/document/templates/components/MarkdownText.java +++ b/src/main/java/com/demcha/compose/document/templates/components/MarkdownText.java @@ -65,7 +65,7 @@ public static List parse(String text, DocumentTextStyle baseStyle) { while (i < source.length()) { // Bold: **...** if (i + 1 < source.length() - && source.charAt(i) == '*' && source.charAt(i + 1) == '*') { + && source.charAt(i) == '*' && source.charAt(i + 1) == '*') { int end = source.indexOf("**", i + 2); if (end > i + 2) { flushPlain(plain, baseStyle, runs); @@ -109,7 +109,7 @@ public static List parse(String text, DocumentTextStyle baseStyle) { } private static void flushPlain(StringBuilder buf, DocumentTextStyle style, - List runs) { + List runs) { if (buf.length() == 0) { return; } diff --git a/src/main/java/com/demcha/compose/document/templates/components/Module.java b/src/main/java/com/demcha/compose/document/templates/components/Module.java index ad7da1c5e..3d63141c1 100644 --- a/src/main/java/com/demcha/compose/document/templates/components/Module.java +++ b/src/main/java/com/demcha/compose/document/templates/components/Module.java @@ -1,23 +1,9 @@ package com.demcha.compose.document.templates.components; -import com.demcha.compose.document.node.ContainerNode; -import com.demcha.compose.document.node.DocumentNode; -import com.demcha.compose.document.node.InlineRun; -import com.demcha.compose.document.node.ListMarker; -import com.demcha.compose.document.node.ListNode; -import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.TextAlign; +import com.demcha.compose.document.node.*; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.blocks.Block; -import com.demcha.compose.document.templates.blocks.BulletListBlock; -import com.demcha.compose.document.templates.blocks.IndentedBlock; -import com.demcha.compose.document.templates.blocks.KeyValueBlock; -import com.demcha.compose.document.templates.blocks.MultiParagraphBlock; -import com.demcha.compose.document.templates.blocks.EducationBlock; -import com.demcha.compose.document.templates.blocks.NumberedListBlock; -import com.demcha.compose.document.templates.blocks.ParagraphBlock; -import com.demcha.compose.document.templates.blocks.WorkHistoryBlock; +import com.demcha.compose.document.templates.blocks.*; import com.demcha.compose.document.templates.themes.Spacing; import com.demcha.compose.document.theme.BusinessTheme; @@ -148,10 +134,10 @@ private ParagraphNode headingParagraph(BusinessTheme theme, Spacing spacing) { /* bookmark */ null, /* padding */ DocumentInsets.zero(), /* margin */ new DocumentInsets( - style.marginAbove, - 0.0, - style.marginBelow, - 0.0), + style.marginAbove, + 0.0, + style.marginBelow, + 0.0), /* autoSize */ null); } @@ -287,13 +273,13 @@ private static String concatStructuredFields( * call this directly after building its own per-item source via * {@link #concatStructuredFields}. * - * @param sources per-item markdown source lines - * @param entryNameSuffix name suffix appended to {@code name} - * for each paragraph (e.g. - * {@code "workEntry"} → {@code ".workEntry[0]"}) + * @param sources per-item markdown source lines + * @param entryNameSuffix name suffix appended to {@code name} + * for each paragraph (e.g. + * {@code "workEntry"} → {@code ".workEntry[0]"}) */ private DocumentNode renderConcatenatedParagraphs(List sources, String entryNameSuffix, - BusinessTheme theme, Spacing spacing) { + BusinessTheme theme, Spacing spacing) { DocumentTextStyle bodyStyle = bodyStyle(theme); List paragraphs = new ArrayList<>(sources.size()); for (int i = 0; i < sources.size(); i++) { @@ -534,7 +520,7 @@ public static Style headingFlat(BusinessTheme theme) { * @param marginBelow vertical margin below the heading (separates * it from the body) */ - public static record Style( + public record Style( DocumentTextStyle headingStyle, DocumentTextStyle bodyStyle, double marginAbove, diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BlueBannerLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BlueBannerLetter.java index 125fa917e..2d40fe7b4 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BlueBannerLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BlueBannerLetter.java @@ -29,13 +29,19 @@ */ public final class BlueBannerLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "blue-banner-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Blue Banner Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; private BlueBannerLetter() { @@ -62,42 +68,36 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2BlueBannerRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("CoverLetterV2BlueBannerHeader", section -> + Headline.spacedCentered(section, doc.identity().name(), theme)) + .addSection("CoverLetterV2BlueBannerContact", section -> + ContactLine.centered(section, doc.identity(), theme)); + + flow.addSection("CoverLetterV2BlueBannerBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } } - - @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2BlueBannerRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("CoverLetterV2BlueBannerHeader", section -> - Headline.spacedCentered(section, doc.identity().name(), theme)) - .addSection("CoverLetterV2BlueBannerContact", section -> - ContactLine.centered(section, doc.identity(), theme)); - - flow.addSection("CoverLetterV2BlueBannerBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BoxedSectionsLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BoxedSectionsLetter.java index 6abca94fe..2ac491e89 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BoxedSectionsLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BoxedSectionsLetter.java @@ -28,13 +28,19 @@ */ public final class BoxedSectionsLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "boxed-sections-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Boxed Sections Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; private BoxedSectionsLetter() { @@ -61,48 +67,42 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2BoxedRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("CoverLetterV2BoxedHeadline", section -> { + section.accentBottom(theme.palette().rule(), + theme.spacing().accentRuleWidth()); + Headline.spacedCentered(section, doc.identity().name(), theme); + }) + .addSection("CoverLetterV2BoxedContact", section -> { + section.accentBottom(theme.palette().rule(), + theme.spacing().accentRuleWidth()); + ContactLine.centered(section, doc.identity(), theme); + }); + + flow.addSection("CoverLetterV2BoxedBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } } - - @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2BoxedRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("CoverLetterV2BoxedHeadline", section -> { - section.accentBottom(theme.palette().rule(), - theme.spacing().accentRuleWidth()); - Headline.spacedCentered(section, doc.identity().name(), theme); - }) - .addSection("CoverLetterV2BoxedContact", section -> { - section.accentBottom(theme.palette().rule(), - theme.spacing().accentRuleWidth()); - ContactLine.centered(section, doc.identity(), theme); - }); - - flow.addSection("CoverLetterV2BoxedBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java index dc26f02cc..b0b2f4c8a 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java @@ -38,13 +38,19 @@ */ public final class CenteredHeadlineLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "centered-headline-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Centered Headline Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; private CenteredHeadlineLetter() { @@ -71,68 +77,62 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - CvIdentity identity = doc.identity(); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2CenteredHeadlineRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("CoverLetterV2CenteredHeadlineHeadline", section -> { - Headline.spacedCentered(section, identity.name(), theme); - if (!identity.jobTitle().isBlank()) { - Subheadline.centeredSpacedCaps(section, - identity.jobTitle(), subheadlineStyle()); - } - }) - .addLine(line -> rule(line, "CoverLetterV2CenteredHeadlineRule", - width, 7, 0)) - .addSection("CoverLetterV2CenteredHeadlineContact", section -> - ContactLine.centered(section, identity, theme)) - .addLine(line -> rule(line, "CoverLetterV2CenteredContactRule", - width, 0, 0)); - - flow.addSection("CoverLetterV2CenteredHeadlineBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + CvIdentity identity = doc.identity(); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2CenteredHeadlineRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("CoverLetterV2CenteredHeadlineHeadline", section -> { + Headline.spacedCentered(section, identity.name(), theme); + if (!identity.jobTitle().isBlank()) { + Subheadline.centeredSpacedCaps(section, + identity.jobTitle(), subheadlineStyle()); + } + }) + .addLine(line -> rule(line, "CoverLetterV2CenteredHeadlineRule", + width, 7, 0)) + .addSection("CoverLetterV2CenteredHeadlineContact", section -> + ContactLine.centered(section, identity, theme)) + .addLine(line -> rule(line, "CoverLetterV2CenteredContactRule", + width, 0, 0)); + + flow.addSection("CoverLetterV2CenteredHeadlineBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } + + private DocumentTextStyle subheadlineStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), 8.6, + DocumentTextDecoration.DEFAULT, theme.palette().muted()); + } + + private void rule(LineBuilder line, String name, double width, + double top, double bottom) { + line.name(name) + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(new DocumentInsets(top, 0, bottom, 0)); + } } - - private DocumentTextStyle subheadlineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), 8.6, - DocumentTextDecoration.DEFAULT, theme.palette().muted()); - } - - private void rule(LineBuilder line, String name, double width, - double top, double bottom) { - line.name(name) - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(new DocumentInsets(top, 0, bottom, 0)); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java index 24224d945..783cc04c5 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java @@ -35,16 +35,24 @@ */ public final class ClassicSerifLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "classic-serif-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Classic Serif Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Bronze accent for contact links. Mirrors the ClassicSerif CV's preset-local token. */ + /** + * Bronze accent for contact links. Mirrors the ClassicSerif CV's preset-local token. + */ private static final DocumentColor ACCENT = DocumentColor.rgb(126, 93, 52); private ClassicSerifLetter() { @@ -71,79 +79,73 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2ClassicSerifRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - addHeader(flow, doc.identity(), width); - - flow.addSection("CoverLetterV2ClassicSerifBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); - } - - private void addHeader(PageFlowBuilder flow, CvIdentity identity, - double width) { - flow.addSection("CoverLetterV2ClassicSerifHeader", section -> { - section.spacing(5); - Headline.spacedCentered(section, identity.name(), theme); - section.addLine(line -> line - .name("CoverLetterV2ClassicSerifHeaderRule") - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(new DocumentInsets(1, 0, 0, 0))); - ContactLine.centered(section, identity, theme, - contactMetaStyle(), contactLinkStyle(), - contactSeparatorStyle()); - }); + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2ClassicSerifRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + addHeader(flow, doc.identity(), width); + + flow.addSection("CoverLetterV2ClassicSerifBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } + + private void addHeader(PageFlowBuilder flow, CvIdentity identity, + double width) { + flow.addSection("CoverLetterV2ClassicSerifHeader", section -> { + section.spacing(5); + Headline.spacedCentered(section, identity.name(), theme); + section.addLine(line -> line + .name("CoverLetterV2ClassicSerifHeaderRule") + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(new DocumentInsets(1, 0, 0, 0))); + ContactLine.centered(section, identity, theme, + contactMetaStyle(), contactLinkStyle(), + contactSeparatorStyle()); + }); + } + + private DocumentTextStyle contactMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().muted()); + } + + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + ACCENT); + } + + private DocumentTextStyle contactSeparatorStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().rule()); + } } - - private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().muted()); - } - - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - ACCENT); - } - - private DocumentTextStyle contactSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().rule()); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java index 3ac0f5a09..385ca0d10 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java @@ -36,25 +36,39 @@ */ public final class CompactMonoLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "compact-mono-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Compact Mono Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Near-black command-bar fill. Mirrors the CompactMono CV token. */ + /** + * Near-black command-bar fill. Mirrors the CompactMono CV token. + */ private static final DocumentColor HEADER = DocumentColor.rgb(18, 24, 32); - /** Contact metadata over the dark band. Mirrors the CV token. */ + /** + * Contact metadata over the dark band. Mirrors the CV token. + */ private static final DocumentColor HEADER_SOFT = DocumentColor.rgb(192, 207, 219); - /** Cyan contact-link colour over the band. Mirrors the CV token. */ + /** + * Cyan contact-link colour over the band. Mirrors the CV token. + */ private static final DocumentColor LINK_CYAN = DocumentColor.rgb(108, 213, 222); - /** Contact separator colour over the band. Mirrors the CV token. */ + /** + * Contact separator colour over the band. Mirrors the CV token. + */ private static final DocumentColor SEPARATOR_GRAY = DocumentColor.rgb(102, 117, 132); private CompactMonoLetter() { @@ -81,88 +95,82 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2CompactMonoRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - addHeader(flow, doc.identity(), width); - - flow.addSection("CoverLetterV2CompactMonoBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); - } - - private void addHeader(PageFlowBuilder flow, CvIdentity identity, - double width) { - flow.addSection("CoverLetterV2CompactMonoHeader", section -> { - section.spacing(4) - .padding(new DocumentInsets(13, 16, 14, 16)) - .fillColor(HEADER) - .cornerRadius(3); - section.addSection("Name", name -> - Headline.uppercaseLeftAligned(name, identity.name(), - theme, headerNameStyle())); - section.addSection("Contact", contact -> - ContactLine.leftAligned(contact, identity, theme, - headerMetaStyle(), headerLinkStyle(), - headerSeparatorStyle())); - section.addLine(line -> line - .name("CoverLetterV2CompactMonoHeaderWidthRule") - .horizontal(Math.max(0, width - 32)) - .color(HEADER) - .thickness(0.1) - .margin(DocumentInsets.zero())); - }); + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2CompactMonoRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + addHeader(flow, doc.identity(), width); + + flow.addSection("CoverLetterV2CompactMonoBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } + + private void addHeader(PageFlowBuilder flow, CvIdentity identity, + double width) { + flow.addSection("CoverLetterV2CompactMonoHeader", section -> { + section.spacing(4) + .padding(new DocumentInsets(13, 16, 14, 16)) + .fillColor(HEADER) + .cornerRadius(3); + section.addSection("Name", name -> + Headline.uppercaseLeftAligned(name, identity.name(), + theme, headerNameStyle())); + section.addSection("Contact", contact -> + ContactLine.leftAligned(contact, identity, theme, + headerMetaStyle(), headerLinkStyle(), + headerSeparatorStyle())); + section.addLine(line -> line + .name("CoverLetterV2CompactMonoHeaderWidthRule") + .horizontal(Math.max(0, width - 32)) + .color(HEADER) + .thickness(0.1) + .margin(DocumentInsets.zero())); + }); + } + + private DocumentTextStyle headerNameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, DocumentColor.WHITE); + } + + private DocumentTextStyle headerMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, HEADER_SOFT); + } + + private DocumentTextStyle headerLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, LINK_CYAN); + } + + private DocumentTextStyle headerSeparatorStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, SEPARATOR_GRAY); + } } - - private DocumentTextStyle headerNameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, DocumentColor.WHITE); - } - - private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, HEADER_SOFT); - } - - private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, LINK_CYAN); - } - - private DocumentTextStyle headerSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, SEPARATOR_GRAY); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java index 8196da203..2bbd61f87 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java @@ -33,16 +33,24 @@ */ public final class EditorialBlueLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "editorial-blue-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Editorial Blue Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Navy display name. Mirrors the EditorialBlue CV's preset-local token. */ + /** + * Navy display name. Mirrors the EditorialBlue CV's preset-local token. + */ private static final DocumentColor NAME_COLOR = DocumentColor.rgb(18, 31, 72); private EditorialBlueLetter() { @@ -69,63 +77,57 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2EditorialBlueRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - flow.addSection("CoverLetterV2EditorialBlueHeader", section -> - Masthead.centered(section, doc.identity(), theme, - mastheadStyle())); - - flow.addSection("CoverLetterV2EditorialBlueBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2EditorialBlueRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + flow.addSection("CoverLetterV2EditorialBlueHeader", section -> + Masthead.centered(section, doc.identity(), theme, + mastheadStyle())); + + flow.addSection("CoverLetterV2EditorialBlueBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } + + private Masthead.Style mastheadStyle() { + DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, NAME_COLOR); + DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA, + 10.0, DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + DocumentTextStyle linkStyle = CvTextStyles.of(FontName.HELVETICA, + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + theme.palette().rule()); + return Masthead.Style.builder() + .nameStyle(nameStyle) + .titleStyle(titleStyle) + .metaStyle(theme.contactStyle()) + .linkStyle(linkStyle) + .separatorStyle(theme.contactStyle()) + .lineMargin(DocumentInsets.top(1)) + .build(); + } } - - private Masthead.Style mastheadStyle() { - DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA, - 10.0, DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - DocumentTextStyle linkStyle = CvTextStyles.of(FontName.HELVETICA, - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - theme.palette().rule()); - return Masthead.Style.builder() - .nameStyle(nameStyle) - .titleStyle(titleStyle) - .metaStyle(theme.contactStyle()) - .linkStyle(linkStyle) - .separatorStyle(theme.contactStyle()) - .lineMargin(DocumentInsets.top(1)) - .build(); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java index f3189d47a..cc5813eef 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java @@ -5,11 +5,7 @@ import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -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.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; @@ -43,28 +39,44 @@ */ public final class EngineeringResumeLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "engineering-resume-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Engineering Resume Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Deep navy command-header fill. Mirrors the EngineeringResume CV token. */ + /** + * Deep navy command-header fill. Mirrors the EngineeringResume CV token. + */ private static final DocumentColor NAVY = DocumentColor.rgb(13, 32, 47); - /** Green accent strip beneath the header. Mirrors the CV token. */ + /** + * Green accent strip beneath the header. Mirrors the CV token. + */ private static final DocumentColor GREEN = DocumentColor.rgb(27, 145, 104); - /** Role-subtitle colour under the name. Mirrors the CV token. */ + /** + * Role-subtitle colour under the name. Mirrors the CV token. + */ private static final DocumentColor SUBTITLE_COLOR = DocumentColor.rgb(190, 209, 219); - /** Contact metadata colour over the navy header. Mirrors the CV token. */ + /** + * Contact metadata colour over the navy header. Mirrors the CV token. + */ private static final DocumentColor CONTACT_META = DocumentColor.rgb(196, 211, 220); - /** Cyan-green contact-link colour over the navy header. Mirrors the CV token. */ + /** + * Cyan-green contact-link colour over the navy header. Mirrors the CV token. + */ private static final DocumentColor CONTACT_LINK = DocumentColor.rgb(78, 207, 161); private EngineeringResumeLetter() { @@ -91,145 +103,139 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } + public String id() { + return ID; + } - @Override - public String displayName() { - return DISPLAY_NAME; - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2EngineeringResumeRoot") - .spacing(theme.spacing().pageFlowSpacing()); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2EngineeringResumeRoot") + .spacing(theme.spacing().pageFlowSpacing()); - addHeader(flow, doc.identity()); + addHeader(flow, doc.identity()); - flow.addSection("CoverLetterV2EngineeringResumeBody", host -> - LetterBody.render(host, doc, theme)); + flow.addSection("CoverLetterV2EngineeringResumeBody", host -> + LetterBody.render(host, doc, theme)); - flow.build(); - } + flow.build(); + } - private void addHeader(PageFlowBuilder flow, CvIdentity identity) { - flow.addSection("CoverLetterV2EngineeringResumeHeader", section -> section - .spacing(5) - .padding(new DocumentInsets(13, 15, 13, 15)) - .fillColor(NAVY) - .cornerRadius(DocumentCornerRadius.top( - theme.spacing().bannerCornerRadius())) - .accentBottom(GREEN, theme.spacing().accentRuleWidth()) - .addRow("CoverLetterV2EngineeringResumeHeaderRow", row -> row - .spacing(12) - .weights(1.15, 0.85) - .addSection("CoverLetterV2EngineeringResumeIdentity", - block -> addIdentityBlock(block, identity)) - .addSection("CoverLetterV2EngineeringResumeContact", - contact -> addContactStack(contact, identity)))); - } + private void addHeader(PageFlowBuilder flow, CvIdentity identity) { + flow.addSection("CoverLetterV2EngineeringResumeHeader", section -> section + .spacing(5) + .padding(new DocumentInsets(13, 15, 13, 15)) + .fillColor(NAVY) + .cornerRadius(DocumentCornerRadius.top( + theme.spacing().bannerCornerRadius())) + .accentBottom(GREEN, theme.spacing().accentRuleWidth()) + .addRow("CoverLetterV2EngineeringResumeHeaderRow", row -> row + .spacing(12) + .weights(1.15, 0.85) + .addSection("CoverLetterV2EngineeringResumeIdentity", + block -> addIdentityBlock(block, identity)) + .addSection("CoverLetterV2EngineeringResumeContact", + contact -> addContactStack(contact, identity)))); + } - private void addIdentityBlock(SectionBuilder block, CvIdentity identity) { - block.padding(DocumentInsets.zero()) - .spacing(3) - .addParagraph(paragraph -> paragraph - .text(identity.name().full().toUpperCase(Locale.ROOT)) - .textStyle(nameStyle()) - .autoSize(theme.typography().sizeHeadline(), 19.0) + private void addIdentityBlock(SectionBuilder block, CvIdentity identity) { + block.padding(DocumentInsets.zero()) + .spacing(3) + .addParagraph(paragraph -> paragraph + .text(identity.name().full().toUpperCase(Locale.ROOT)) + .textStyle(nameStyle()) + .autoSize(theme.typography().sizeHeadline(), 19.0) + .margin(DocumentInsets.zero())); + String subtitle = headerSubtitleText(identity); + if (!subtitle.isBlank()) { + block.addParagraph(paragraph -> paragraph + .text(subtitle) + .textStyle(subtitleStyle()) .margin(DocumentInsets.zero())); - String subtitle = headerSubtitleText(identity); - if (!subtitle.isBlank()) { - block.addParagraph(paragraph -> paragraph - .text(subtitle) - .textStyle(subtitleStyle()) - .margin(DocumentInsets.zero())); + } } - } - private void addContactStack(SectionBuilder section, CvIdentity identity) { - section.spacing(2).padding(DocumentInsets.zero()); - DocumentTextStyle meta = contactMetaStyle(); - DocumentTextStyle link = contactLinkStyle(); - for (ContactPart part : contactParts(identity)) { - section.addParagraph(paragraph -> paragraph - .text(part.text()) - .textStyle(part.linkOptions() == null ? meta : link) - .link(part.linkOptions()) - .align(TextAlign.RIGHT) - .margin(DocumentInsets.zero())); + private void addContactStack(SectionBuilder section, CvIdentity identity) { + section.spacing(2).padding(DocumentInsets.zero()); + DocumentTextStyle meta = contactMetaStyle(); + DocumentTextStyle link = contactLinkStyle(); + for (ContactPart part : contactParts(identity)) { + section.addParagraph(paragraph -> paragraph + .text(part.text()) + .textStyle(part.linkOptions() == null ? meta : link) + .link(part.linkOptions()) + .align(TextAlign.RIGHT) + .margin(DocumentInsets.zero())); + } } - } - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, DocumentColor.WHITE); - } - - private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), 7.6, - DocumentTextDecoration.BOLD, SUBTITLE_COLOR); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, DocumentColor.WHITE); + } - private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, CONTACT_META); - } + private DocumentTextStyle subtitleStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), 7.6, + DocumentTextDecoration.BOLD, SUBTITLE_COLOR); + } - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, CONTACT_LINK); - } + private DocumentTextStyle contactMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, CONTACT_META); + } - private static String headerSubtitleText(CvIdentity identity) { - String jobTitle = identity.jobTitle(); - if (jobTitle == null || jobTitle.isBlank()) { - return ""; + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, CONTACT_LINK); } - return MarkdownInline.plainText(jobTitle).toUpperCase(Locale.ROOT); - } - private static List contactParts(CvIdentity identity) { - List parts = new ArrayList<>(); - addPart(parts, identity.contact().address(), null); - addPart(parts, identity.contact().phone(), null); - String email = identity.contact().email(); - if (!email.isBlank()) { - addPart(parts, email, new DocumentLinkOptions("mailto:" + email)); + private static String headerSubtitleText(CvIdentity identity) { + String jobTitle = identity.jobTitle(); + if (jobTitle == null || jobTitle.isBlank()) { + return ""; + } + return MarkdownInline.plainText(jobTitle).toUpperCase(Locale.ROOT); } - for (CvLink link : identity.links()) { - addPart(parts, link.label(), link.url().isBlank() - ? null - : new DocumentLinkOptions(link.url().trim())); + + private static List contactParts(CvIdentity identity) { + List parts = new ArrayList<>(); + addPart(parts, identity.contact().address(), null); + addPart(parts, identity.contact().phone(), null); + String email = identity.contact().email(); + if (!email.isBlank()) { + addPart(parts, email, new DocumentLinkOptions("mailto:" + email)); + } + for (CvLink link : identity.links()) { + addPart(parts, link.label(), link.url().isBlank() + ? null + : new DocumentLinkOptions(link.url().trim())); + } + return List.copyOf(parts); } - return List.copyOf(parts); - } - private static void addPart(List parts, String text, - DocumentLinkOptions linkOptions) { - if (text != null && !text.isBlank()) { - parts.add(new ContactPart(text.trim(), linkOptions)); + private static void addPart(List parts, String text, + DocumentLinkOptions linkOptions) { + if (text != null && !text.isBlank()) { + parts.add(new ContactPart(text.trim(), linkOptions)); + } } - } - private record ContactPart(String text, DocumentLinkOptions linkOptions) { + private record ContactPart(String text, DocumentLinkOptions linkOptions) { + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java index f376744ca..616d3e5eb 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java @@ -43,13 +43,19 @@ */ public final class ExecutiveLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "executive-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Executive Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; /** @@ -93,133 +99,127 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); + @Override + public String displayName() { + return DISPLAY_NAME; + } - double width = document.canvas().innerWidth(); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2ExecutiveRoot") - .spacing(theme.spacing().pageFlowSpacing()); + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); - addHeader(flow, doc.identity(), width); + double width = document.canvas().innerWidth(); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2ExecutiveRoot") + .spacing(theme.spacing().pageFlowSpacing()); - flow.addSection("CoverLetterV2ExecutiveBody", host -> - LetterBody.render(host, doc, theme)); + addHeader(flow, doc.identity(), width); - flow.build(); - } + flow.addSection("CoverLetterV2ExecutiveBody", host -> + LetterBody.render(host, doc, theme)); - private void addHeader(PageFlowBuilder flow, CvIdentity identity, - double width) { - flow.addSection("CoverLetterV2ExecutiveHeader", section -> { - section.spacing(2) - .padding(DocumentInsets.zero()); - Headline.uppercaseLeftAligned(section, identity.name(), theme, - nameStyle()); - String meta = TextOrnaments.joinPipe(identity.contact().address(), - identity.contact().phone()); - if (!meta.isBlank()) { - section.addParagraph(paragraph -> paragraph - .text(meta) - .textStyle(metaStyle()) - .align(TextAlign.LEFT) - .margin(DocumentInsets.top(2))); - } - addLinkRow(section, identity); - section.addLine(line -> line - .name("CoverLetterV2ExecutiveHeaderRule") - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(DocumentInsets.top(5))); - }); - } + flow.build(); + } - private void addLinkRow(SectionBuilder section, CvIdentity identity) { - boolean hasEmail = !identity.contact().email().isBlank(); - boolean hasLinks = !identity.links().isEmpty(); - if (!hasEmail && !hasLinks) { - return; + private void addHeader(PageFlowBuilder flow, CvIdentity identity, + double width) { + flow.addSection("CoverLetterV2ExecutiveHeader", section -> { + section.spacing(2) + .padding(DocumentInsets.zero()); + Headline.uppercaseLeftAligned(section, identity.name(), theme, + nameStyle()); + String meta = TextOrnaments.joinPipe(identity.contact().address(), + identity.contact().phone()); + if (!meta.isBlank()) { + section.addParagraph(paragraph -> paragraph + .text(meta) + .textStyle(metaStyle()) + .align(TextAlign.LEFT) + .margin(DocumentInsets.top(2))); + } + addLinkRow(section, identity); + section.addLine(line -> line + .name("CoverLetterV2ExecutiveHeaderRule") + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(DocumentInsets.top(5))); + }); } - DocumentTextStyle bodyStyle = linkRowBodyStyle(); - DocumentTextStyle linkStyle = linkRowLinkStyle(); - section.addParagraph(paragraph -> paragraph - .textStyle(bodyStyle) - .align(TextAlign.LEFT) - .margin(DocumentInsets.top(1)) - .rich(rich -> { - boolean first = true; - String email = identity.contact().email(); - if (!email.isBlank()) { - rich.with(email, linkStyle, - new DocumentLinkOptions("mailto:" + email)); - first = false; - } - for (CvLink link : identity.links()) { - if (link.label().isBlank()) { - continue; - } - if (!first) { - rich.style(" | ", bodyStyle); + + private void addLinkRow(SectionBuilder section, CvIdentity identity) { + boolean hasEmail = !identity.contact().email().isBlank(); + boolean hasLinks = !identity.links().isEmpty(); + if (!hasEmail && !hasLinks) { + return; + } + DocumentTextStyle bodyStyle = linkRowBodyStyle(); + DocumentTextStyle linkStyle = linkRowLinkStyle(); + section.addParagraph(paragraph -> paragraph + .textStyle(bodyStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.top(1)) + .rich(rich -> { + boolean first = true; + String email = identity.contact().email(); + if (!email.isBlank()) { + rich.with(email, linkStyle, + new DocumentLinkOptions("mailto:" + email)); + first = false; } - first = false; - if (link.url().isBlank()) { - rich.style(link.label(), bodyStyle); - } else { - rich.with(link.label(), linkStyle, - new DocumentLinkOptions(link.url())); + for (CvLink link : identity.links()) { + if (link.label().isBlank()) { + continue; + } + if (!first) { + rich.style(" | ", bodyStyle); + } + first = false; + if (link.url().isBlank()) { + rich.style(link.label(), bodyStyle); + } else { + rich.with(link.label(), linkStyle, + new DocumentLinkOptions(link.url())); + } } - } - })); - } + })); + } - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, - PRIMARY_NAME); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(FontName.POPPINS, + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, + PRIMARY_NAME); + } - private DocumentTextStyle metaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle metaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle linkRowBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle linkRowBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle linkRowLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.UNDERLINE, - ACCENT); + private DocumentTextStyle linkRowLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.UNDERLINE, + ACCENT); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java index 7b2726be0..d5123a3e4 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java @@ -8,11 +8,7 @@ import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.ParagraphNode; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.ClipPolicy; -import com.demcha.compose.document.style.DocumentColor; -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.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; @@ -45,13 +41,19 @@ */ public final class MintEditorialLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "mint-editorial-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Mint Editorial Letter"; - /** Recommended symmetric page margin (in points). Matches the CV preset. */ + /** + * Recommended symmetric page margin (in points). Matches the CV preset. + */ public static final double RECOMMENDED_MARGIN = 48.0; // Banded-masthead canvas geometry — mirrors the CV preset so the matched @@ -59,16 +61,24 @@ public final class MintEditorialLetter { // (bandless) masthead positions so the banded render only adds a fill // behind an otherwise-unchanged masthead. - /** Canvas flow footprint (points) — matches the CV masthead footprint. */ + /** + * Canvas flow footprint (points) — matches the CV masthead footprint. + */ private static final double MASTHEAD_CANVAS_HEIGHT = 143.76; - /** Canvas-local y (points) of the masthead name — matches the default top. */ + /** + * Canvas-local y (points) of the masthead name — matches the default top. + */ private static final double MASTHEAD_NAME_Y = 48.0; - /** Canvas-local y (points) of the masthead tagline — matches the default top. */ + /** + * Canvas-local y (points) of the masthead tagline — matches the default top. + */ private static final double MASTHEAD_TAGLINE_Y = 87.4; - /** Canvas-local y (points) of the masthead rule — matches the default top. */ + /** + * Canvas-local y (points) of the masthead rule — matches the default top. + */ private static final double MASTHEAD_RULE_Y = 123.76; private MintEditorialLetter() { @@ -356,11 +366,11 @@ private void addBandedMasthead(SectionBuilder section, String jobTitle = identity.jobTitle(); ParagraphNode tagline = jobTitle != null && !jobTitle.isBlank() ? new ParagraphBuilder() - .name("CoverLetterV2MintEditorialHeaderTagline") - .text(TextOrnaments.spacedUpper(jobTitle)) - .textStyle(taglineStyle()) - .align(TextAlign.CENTER) - .build() + .name("CoverLetterV2MintEditorialHeaderTagline") + .text(TextOrnaments.spacedUpper(jobTitle)) + .textStyle(taglineStyle()) + .align(TextAlign.CENTER) + .build() : null; section.addCanvas(pageWidth, canvasH, canvas -> { diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java index d2d8168f9..1e16040f9 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java @@ -36,19 +36,29 @@ */ public final class ModernProfessionalLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "modern-professional-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Modern Professional Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Slate-blue display name. Mirrors the ModernProfessional CV's preset-local token. */ + /** + * Slate-blue display name. Mirrors the ModernProfessional CV's preset-local token. + */ private static final DocumentColor NAME_COLOR = DocumentColor.rgb(44, 62, 80); - /** Royal-blue contact links. Mirrors the ModernProfessional CV's preset-local token. */ + /** + * Royal-blue contact links. Mirrors the ModernProfessional CV's preset-local token. + */ private static final DocumentColor LINK_COLOR = DocumentColor.rgb(65, 105, 225); private ModernProfessionalLetter() { @@ -75,61 +85,55 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, NAME_COLOR); + DocumentTextStyle contactBodyStyle = CvTextStyles.of(FontName.HELVETICA, + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + DocumentTextStyle contactLinkStyle = CvTextStyles.of(FontName.HELVETICA, + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, LINK_COLOR); + DocumentTextStyle contactSeparatorStyle = CvTextStyles.of(FontName.HELVETICA, + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().rule()); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2ModernRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("Header", section -> + Headline.rightAligned(section, doc.identity().name(), + theme, nameStyle)) + .addSection("Contact", section -> { + section.accentBottom(theme.palette().rule(), + theme.spacing().accentRuleWidth()); + ContactLine.twoRowRightAligned(section, doc.identity(), + theme, contactBodyStyle, contactLinkStyle, + contactSeparatorStyle); + }); + + flow.addSection("CoverLetterV2ModernBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } } - - @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle contactBodyStyle = CvTextStyles.of(FontName.HELVETICA, - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, theme.palette().ink()); - DocumentTextStyle contactLinkStyle = CvTextStyles.of(FontName.HELVETICA, - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, LINK_COLOR); - DocumentTextStyle contactSeparatorStyle = CvTextStyles.of(FontName.HELVETICA, - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, theme.palette().rule()); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2ModernRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("Header", section -> - Headline.rightAligned(section, doc.identity().name(), - theme, nameStyle)) - .addSection("Contact", section -> { - section.accentBottom(theme.palette().rule(), - theme.spacing().accentRuleWidth()); - ContactLine.twoRowRightAligned(section, doc.identity(), - theme, contactBodyStyle, contactLinkStyle, - contactSeparatorStyle); - }); - - flow.addSection("CoverLetterV2ModernBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java index 30285b467..482de7220 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java @@ -1,20 +1,12 @@ package com.demcha.compose.document.templates.coverletter.v2.presets; import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.EllipseBuilder; -import com.demcha.compose.document.dsl.LayerStackBuilder; -import com.demcha.compose.document.dsl.PageFlowBuilder; -import com.demcha.compose.document.dsl.ParagraphBuilder; -import com.demcha.compose.document.dsl.SectionBuilder; +import com.demcha.compose.document.dsl.*; import com.demcha.compose.document.node.LayerAlign; import com.demcha.compose.document.node.LayerStackNode; import com.demcha.compose.document.node.SpacerNode; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; @@ -49,25 +41,39 @@ */ public final class MonogramSidebarLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "monogram-sidebar-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Monogram Sidebar Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Muted gold accent (name sub-line + links). Mirrors the CV token. */ + /** + * Muted gold accent (name sub-line + links). Mirrors the CV token. + */ private static final DocumentColor ACCENT = DocumentColor.rgb(158, 146, 104); - /** Dark slate monogram ring + initials. Mirrors the CV token. */ + /** + * Dark slate monogram ring + initials. Mirrors the CV token. + */ private static final DocumentColor MONOGRAM_RING = DocumentColor.rgb(54, 62, 74); - /** PT-Serif used only for the monogram initials. Mirrors the CV token. */ + /** + * PT-Serif used only for the monogram initials. Mirrors the CV token. + */ private static final FontName MONOGRAM_FONT = FontName.PT_SERIF; - /** Monogram ring diameter (matches the CV badge). */ + /** + * Monogram ring diameter (matches the CV badge). + */ private static final double MONOGRAM_DIAMETER = 122.0; /** @@ -101,166 +107,160 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double innerWidth = document.canvas().innerWidth(); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2MonogramSidebarRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - flow.addSection("CoverLetterV2MonogramSidebarHeader", section -> { - section.spacing(2).padding(DocumentInsets.zero()); - addMonogramBlock(section, initials(doc.identity().name()), - innerWidth); - addNameBlock(section, doc.identity()); - ContactLine.centered(section, doc.identity(), theme, - contactMetaStyle(), contactLinkStyle(), - contactSeparatorStyle()); - }); - - flow.addSection("CoverLetterV2MonogramSidebarBody", host -> - LetterBody.render(host, doc, theme, LETTER_BODY_SIZE)); - - flow.build(); - } - - private void addMonogramBlock(SectionBuilder section, String initialsText, - double innerWidth) { - LayerStackNode badge = new LayerStackBuilder() - .name("CoverLetterV2MonogramSidebarBadge") - .back(new EllipseBuilder() - .name("CoverLetterV2MonogramSidebarRing") - .size(MONOGRAM_DIAMETER, MONOGRAM_DIAMETER) - .stroke(DocumentStroke.of(MONOGRAM_RING, 1.25)) - .build()) - .layer(new ParagraphBuilder() - .name("CoverLetterV2MonogramSidebarInitials") - .text(initialsText) - .textStyle(CvTextStyles.of(MONOGRAM_FONT, 44.0, - DocumentTextDecoration.BOLD, MONOGRAM_RING)) - .align(TextAlign.LEFT) - .build(), LayerAlign.CENTER) - .build(); - - section.addLayerStack(outer -> outer - .name("CoverLetterV2MonogramSidebarFrame") - .margin(DocumentInsets.bottom(20)) - .back(new SpacerNode( - "CoverLetterV2MonogramSidebarSpace", - Math.max(MONOGRAM_DIAMETER, innerWidth), - MONOGRAM_DIAMETER, - DocumentInsets.zero(), - DocumentInsets.zero())) - .layer(badge, LayerAlign.TOP_CENTER)); - } - - private void addNameBlock(SectionBuilder section, CvIdentity identity) { - CvName name = identity.name(); - List parts = new ArrayList<>(); - if (!name.first().isBlank()) { - parts.add(name.first()); - } - if (!name.last().isBlank()) { - parts.add(name.last()); + public String id() { + return ID; } - if (parts.isEmpty()) { - parts.add(""); + + @Override + public String displayName() { + return DISPLAY_NAME; } - DocumentTextStyle nameStyle = nameStyle(); - DocumentTextStyle titleStyle = subtitleStyle(); - - for (int index = 0; index < parts.size(); index++) { - String part = parts.get(index); - DocumentInsets margin = index == parts.size() - 1 - ? DocumentInsets.zero() - : DocumentInsets.bottom(6); - section.addParagraph(paragraph -> paragraph - .text(TextOrnaments.spacedUpper(part)) - .textStyle(nameStyle) - .align(TextAlign.CENTER) - .lineSpacing(1.0) - .margin(margin)); + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double innerWidth = document.canvas().innerWidth(); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2MonogramSidebarRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + flow.addSection("CoverLetterV2MonogramSidebarHeader", section -> { + section.spacing(2).padding(DocumentInsets.zero()); + addMonogramBlock(section, initials(doc.identity().name()), + innerWidth); + addNameBlock(section, doc.identity()); + ContactLine.centered(section, doc.identity(), theme, + contactMetaStyle(), contactLinkStyle(), + contactSeparatorStyle()); + }); + + flow.addSection("CoverLetterV2MonogramSidebarBody", host -> + LetterBody.render(host, doc, theme, LETTER_BODY_SIZE)); + + flow.build(); } - String jobTitle = identity.jobTitle(); - if (jobTitle != null && !jobTitle.isBlank()) { - section.addParagraph(paragraph -> paragraph - .text(TextOrnaments.spacedUpper(jobTitle)) - .textStyle(titleStyle) - .align(TextAlign.CENTER) - .margin(new DocumentInsets(12, 0, 18, 0))); + + private void addMonogramBlock(SectionBuilder section, String initialsText, + double innerWidth) { + LayerStackNode badge = new LayerStackBuilder() + .name("CoverLetterV2MonogramSidebarBadge") + .back(new EllipseBuilder() + .name("CoverLetterV2MonogramSidebarRing") + .size(MONOGRAM_DIAMETER, MONOGRAM_DIAMETER) + .stroke(DocumentStroke.of(MONOGRAM_RING, 1.25)) + .build()) + .layer(new ParagraphBuilder() + .name("CoverLetterV2MonogramSidebarInitials") + .text(initialsText) + .textStyle(CvTextStyles.of(MONOGRAM_FONT, 44.0, + DocumentTextDecoration.BOLD, MONOGRAM_RING)) + .align(TextAlign.LEFT) + .build(), LayerAlign.CENTER) + .build(); + + section.addLayerStack(outer -> outer + .name("CoverLetterV2MonogramSidebarFrame") + .margin(DocumentInsets.bottom(20)) + .back(new SpacerNode( + "CoverLetterV2MonogramSidebarSpace", + Math.max(MONOGRAM_DIAMETER, innerWidth), + MONOGRAM_DIAMETER, + DocumentInsets.zero(), + DocumentInsets.zero())) + .layer(badge, LayerAlign.TOP_CENTER)); } - } - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.DEFAULT, theme.palette().ink()); - } + private void addNameBlock(SectionBuilder section, CvIdentity identity) { + CvName name = identity.name(); + List parts = new ArrayList<>(); + if (!name.first().isBlank()) { + parts.add(name.first()); + } + if (!name.last().isBlank()) { + parts.add(name.last()); + } + if (parts.isEmpty()) { + parts.add(""); + } + DocumentTextStyle nameStyle = nameStyle(); + DocumentTextStyle titleStyle = subtitleStyle(); + + for (int index = 0; index < parts.size(); index++) { + String part = parts.get(index); + DocumentInsets margin = index == parts.size() - 1 + ? DocumentInsets.zero() + : DocumentInsets.bottom(6); + section.addParagraph(paragraph -> paragraph + .text(TextOrnaments.spacedUpper(part)) + .textStyle(nameStyle) + .align(TextAlign.CENTER) + .lineSpacing(1.0) + .margin(margin)); + } + String jobTitle = identity.jobTitle(); + if (jobTitle != null && !jobTitle.isBlank()) { + section.addParagraph(paragraph -> paragraph + .text(TextOrnaments.spacedUpper(jobTitle)) + .textStyle(titleStyle) + .align(TextAlign.CENTER) + .margin(new DocumentInsets(12, 0, 18, 0))); + } + } - private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.BOLD, ACCENT); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + } - private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, theme.palette().muted()); - } + private DocumentTextStyle subtitleStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.BOLD, ACCENT); + } - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, ACCENT); - } + private DocumentTextStyle contactMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().muted()); + } - private DocumentTextStyle contactSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, theme.palette().rule()); - } + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, ACCENT); + } - private static String initials(CvName name) { - if (name == null) { - return ""; + private DocumentTextStyle contactSeparatorStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().rule()); } - StringBuilder builder = new StringBuilder(); - appendInitial(builder, name.first()); - appendInitial(builder, name.last()); - return builder.toString(); - } - private static void appendInitial(StringBuilder builder, String value) { - if (builder.length() >= 2 || value == null) { - return; + private static String initials(CvName name) { + if (name == null) { + return ""; + } + StringBuilder builder = new StringBuilder(); + appendInitial(builder, name.first()); + appendInitial(builder, name.last()); + return builder.toString(); } - String trimmed = value.trim(); - if (!trimmed.isEmpty() && Character.isLetter(trimmed.charAt(0))) { - builder.append(Character.toUpperCase(trimmed.charAt(0))); + + private static void appendInitial(StringBuilder builder, String value) { + if (builder.length() >= 2 || value == null) { + return; + } + String trimmed = value.trim(); + if (!trimmed.isEmpty() && Character.isLetter(trimmed.charAt(0))) { + builder.append(Character.toUpperCase(trimmed.charAt(0))); + } } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java index 7ead4ef55..ac8007f21 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java @@ -37,16 +37,24 @@ */ public final class NordicCleanLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "nordic-clean-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Nordic Clean Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Teal accent bar + link colour. Mirrors the NordicClean CV default accent. */ + /** + * Teal accent bar + link colour. Mirrors the NordicClean CV default accent. + */ private static final DocumentColor ACCENT = DocumentColor.rgb(28, 128, 135); private NordicCleanLetter() { @@ -73,88 +81,82 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2NordicCleanRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - addHeader(flow, doc.identity()); - - flow.addSection("CoverLetterV2NordicCleanBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); - } - - private void addHeader(PageFlowBuilder flow, CvIdentity identity) { - flow.addRow("CoverLetterV2NordicCleanHeader", row -> row - .spacing(14) - .weights(1.2, 0.8) - .addSection("Identity", id -> { - id.spacing(3).padding(new DocumentInsets(1, 0, 2, 0)); - Headline.uppercaseLeftAligned(id, identity.name(), theme, - headlineStyle()); - id.addShape(shape -> shape - .name("CoverLetterV2NordicCleanNameAccent") - .size(64, 2.6) - .fillColor(ACCENT) - .cornerRadius(1.3) - .margin(DocumentInsets.zero())); - if (!identity.jobTitle().isBlank()) { - id.addParagraph(paragraph -> paragraph - .text(MarkdownInline.plainText(identity.jobTitle()) - .toUpperCase(Locale.ROOT)) - .textStyle(CvTextStyles.of( - theme.typography().bodyFont(), 7.7, - DocumentTextDecoration.BOLD, - theme.palette().muted())) + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2NordicCleanRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + addHeader(flow, doc.identity()); + + flow.addSection("CoverLetterV2NordicCleanBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } + + private void addHeader(PageFlowBuilder flow, CvIdentity identity) { + flow.addRow("CoverLetterV2NordicCleanHeader", row -> row + .spacing(14) + .weights(1.2, 0.8) + .addSection("Identity", id -> { + id.spacing(3).padding(new DocumentInsets(1, 0, 2, 0)); + Headline.uppercaseLeftAligned(id, identity.name(), theme, + headlineStyle()); + id.addShape(shape -> shape + .name("CoverLetterV2NordicCleanNameAccent") + .size(64, 2.6) + .fillColor(ACCENT) + .cornerRadius(1.3) .margin(DocumentInsets.zero())); - } - }) - .addSection("Contact", contact -> - ContactLine.rightAlignedStacked(contact, identity, - theme, contactMetaStyle(), contactLinkStyle()))); + if (!identity.jobTitle().isBlank()) { + id.addParagraph(paragraph -> paragraph + .text(MarkdownInline.plainText(identity.jobTitle()) + .toUpperCase(Locale.ROOT)) + .textStyle(CvTextStyles.of( + theme.typography().bodyFont(), 7.7, + DocumentTextDecoration.BOLD, + theme.palette().muted())) + .margin(DocumentInsets.zero())); + } + }) + .addSection("Contact", contact -> + ContactLine.rightAlignedStacked(contact, identity, + theme, contactMetaStyle(), contactLinkStyle()))); + } + + private DocumentTextStyle headlineStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, theme.palette().ink()); + } + + private DocumentTextStyle contactMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().muted()); + } + + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, ACCENT); + } } - - private DocumentTextStyle headlineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, theme.palette().ink()); - } - - private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, theme.palette().muted()); - } - - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, ACCENT); - } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java index a5a8ffa51..fa6ace1e8 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java @@ -5,11 +5,7 @@ import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; @@ -44,22 +40,34 @@ */ public final class PanelLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "panel-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Panel Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Deep navy masthead text. Mirrors the Panel CV's preset-local token. */ + /** + * Deep navy masthead text. Mirrors the Panel CV's preset-local token. + */ private static final DocumentColor HEADER_TEXT = DocumentColor.rgb(20, 44, 66); - /** Teal accent for header links. Mirrors the Panel CV's preset-local token. */ + /** + * Teal accent for header links. Mirrors the Panel CV's preset-local token. + */ private static final DocumentColor ACCENT = DocumentColor.rgb(0, 128, 128); - /** Thin card stroke — single value keeps the card outline crisp. Mirrors the CV. */ + /** + * Thin card stroke — single value keeps the card outline crisp. Mirrors the CV. + */ private static final double PANEL_STROKE_THICKNESS = 0.45; private PanelLetter() { @@ -86,151 +94,145 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } + public String id() { + return ID; + } - @Override - public String displayName() { - return DISPLAY_NAME; - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); - double innerWidth = document.canvas().innerWidth(); - double cardPadding = theme.spacing().bannerInnerPadding(); - double cardContentWidth = innerWidth - 2 * cardPadding; + double innerWidth = document.canvas().innerWidth(); + double cardPadding = theme.spacing().bannerInnerPadding(); + double cardContentWidth = innerWidth - 2 * cardPadding; - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2PanelRoot") - .spacing(theme.spacing().pageFlowSpacing()); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2PanelRoot") + .spacing(theme.spacing().pageFlowSpacing()); - addHeader(flow, doc.identity(), cardContentWidth); + addHeader(flow, doc.identity(), cardContentWidth); - flow.addSection("CoverLetterV2PanelBody", host -> - LetterBody.render(host, doc, theme)); + flow.addSection("CoverLetterV2PanelBody", host -> + LetterBody.render(host, doc, theme)); - flow.build(); - } + flow.build(); + } - private void addHeader(PageFlowBuilder flow, CvIdentity identity, - double anchorWidth) { - CardWidget.render(flow, "CoverLetterV2PanelHeader", headerStyle(), - card -> { - widthAnchor(card, anchorWidth); - card.addParagraph(paragraph -> paragraph - .text(identity.name().full().toUpperCase(Locale.ROOT)) - .textStyle(nameStyle()) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero())); - if (!identity.jobTitle().isBlank()) { + private void addHeader(PageFlowBuilder flow, CvIdentity identity, + double anchorWidth) { + CardWidget.render(flow, "CoverLetterV2PanelHeader", headerStyle(), + card -> { + widthAnchor(card, anchorWidth); card.addParagraph(paragraph -> paragraph - .text(identity.jobTitle()) - .textStyle(headerBodyStyle()) + .text(identity.name().full().toUpperCase(Locale.ROOT)) + .textStyle(nameStyle()) .align(TextAlign.CENTER) .margin(DocumentInsets.zero())); - } - String contact = TextOrnaments.joinPipe(identity.contact().address(), - identity.contact().phone()); - if (!contact.isBlank()) { - card.addParagraph(paragraph -> paragraph - .text(contact) - .textStyle(headerMetaStyle()) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero())); - } - addLinkRow(card, identity); - }); - } - - private void addLinkRow(SectionBuilder section, CvIdentity identity) { - boolean hasEmail = !identity.contact().email().isBlank(); - boolean hasLinks = !identity.links().isEmpty(); - if (!hasEmail && !hasLinks) { - return; - } - DocumentTextStyle bodyStyle = headerMetaStyle(); - DocumentTextStyle linkStyle = headerLinkStyle(); - section.addParagraph(paragraph -> paragraph - .textStyle(bodyStyle) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero()) - .rich(rich -> { - boolean first = true; - String email = identity.contact().email(); - if (!email.isBlank()) { - rich.with(email, linkStyle, - new DocumentLinkOptions("mailto:" + email)); - first = false; - } - for (CvLink link : identity.links()) { - if (link.label().isBlank()) { - continue; + if (!identity.jobTitle().isBlank()) { + card.addParagraph(paragraph -> paragraph + .text(identity.jobTitle()) + .textStyle(headerBodyStyle()) + .align(TextAlign.CENTER) + .margin(DocumentInsets.zero())); } - if (!first) { - rich.style(" | ", bodyStyle); + String contact = TextOrnaments.joinPipe(identity.contact().address(), + identity.contact().phone()); + if (!contact.isBlank()) { + card.addParagraph(paragraph -> paragraph + .text(contact) + .textStyle(headerMetaStyle()) + .align(TextAlign.CENTER) + .margin(DocumentInsets.zero())); } - first = false; - if (link.url().isBlank()) { - rich.style(link.label(), bodyStyle); - } else { - rich.with(link.label(), linkStyle, - new DocumentLinkOptions(link.url())); + addLinkRow(card, identity); + }); + } + + private void addLinkRow(SectionBuilder section, CvIdentity identity) { + boolean hasEmail = !identity.contact().email().isBlank(); + boolean hasLinks = !identity.links().isEmpty(); + if (!hasEmail && !hasLinks) { + return; + } + DocumentTextStyle bodyStyle = headerMetaStyle(); + DocumentTextStyle linkStyle = headerLinkStyle(); + section.addParagraph(paragraph -> paragraph + .textStyle(bodyStyle) + .align(TextAlign.CENTER) + .margin(DocumentInsets.zero()) + .rich(rich -> { + boolean first = true; + String email = identity.contact().email(); + if (!email.isBlank()) { + rich.with(email, linkStyle, + new DocumentLinkOptions("mailto:" + email)); + first = false; } - } - })); - } + for (CvLink link : identity.links()) { + if (link.label().isBlank()) { + continue; + } + if (!first) { + rich.style(" | ", bodyStyle); + } + first = false; + if (link.url().isBlank()) { + rich.style(link.label(), bodyStyle); + } else { + rich.with(link.label(), linkStyle, + new DocumentLinkOptions(link.url())); + } + } + })); + } - private void widthAnchor(SectionBuilder card, double width) { - card.spacer(width, 0.0); - } + private void widthAnchor(SectionBuilder card, double width) { + card.spacer(width, 0.0); + } - private CardWidget.Style headerStyle() { - return CardWidget.Style.builder() - .spacing(4) - .padding(DocumentInsets.of(theme.spacing().bannerInnerPadding())) - .fillColor(theme.palette().banner()) - .stroke(DocumentStroke.of(theme.palette().rule(), - PANEL_STROKE_THICKNESS)) - .cornerRadius(theme.spacing().bannerCornerRadius()) - .build(); - } + private CardWidget.Style headerStyle() { + return CardWidget.Style.builder() + .spacing(4) + .padding(DocumentInsets.of(theme.spacing().bannerInnerPadding())) + .fillColor(theme.palette().banner()) + .stroke(DocumentStroke.of(theme.palette().rule(), + PANEL_STROKE_THICKNESS)) + .cornerRadius(theme.spacing().bannerCornerRadius()) + .build(); + } - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, HEADER_TEXT); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(FontName.POPPINS, + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, HEADER_TEXT); + } - private DocumentTextStyle headerBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.DEFAULT, theme.palette().ink()); - } + private DocumentTextStyle headerBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + } - private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, theme.palette().ink()); - } + private DocumentTextStyle headerMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + } - private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, ACCENT); + private DocumentTextStyle headerLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, ACCENT); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java index 04fa00b9e..4e73681f3 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java @@ -2,7 +2,6 @@ import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; -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.DocumentTextDecoration; @@ -34,13 +33,19 @@ */ public final class SidebarPortraitLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "sidebar-portrait-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Sidebar Portrait Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; private SidebarPortraitLetter() { @@ -67,99 +72,93 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; - } - - @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2SidebarPortraitRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - addHeroBand(flow, doc.identity()); - addContact(flow, doc.identity()); - - flow.addSection("CoverLetterV2SidebarPortraitBody", host -> - LetterBody.render(host, doc, theme)); - - flow.build(); - } - - private void addHeroBand(PageFlowBuilder flow, CvIdentity identity) { - String displayName = identity.name().full(); - String jobTitle = identity.jobTitle(); - String subline = jobTitle == null || jobTitle.isBlank() - ? "" - : TextOrnaments.spacedUpper(jobTitle); - flow.addSection("CoverLetterV2SidebarPortraitHero", hero -> { - // No fill: the CV's beige hero band reads as a coloured box - // on a single-column letter, which clashed with the concept, - // so the name treatment is kept but the background dropped. - hero.padding(new DocumentInsets(19, 34, 17, 34)) - .spacing(3) - .addParagraph(paragraph -> paragraph - .text(displayName) - .textStyle(nameStyle()) + public String id() { + return ID; + } + + @Override + public String displayName() { + return DISPLAY_NAME; + } + + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2SidebarPortraitRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + addHeroBand(flow, doc.identity()); + addContact(flow, doc.identity()); + + flow.addSection("CoverLetterV2SidebarPortraitBody", host -> + LetterBody.render(host, doc, theme)); + + flow.build(); + } + + private void addHeroBand(PageFlowBuilder flow, CvIdentity identity) { + String displayName = identity.name().full(); + String jobTitle = identity.jobTitle(); + String subline = jobTitle == null || jobTitle.isBlank() + ? "" + : TextOrnaments.spacedUpper(jobTitle); + flow.addSection("CoverLetterV2SidebarPortraitHero", hero -> { + // No fill: the CV's beige hero band reads as a coloured box + // on a single-column letter, which clashed with the concept, + // so the name treatment is kept but the background dropped. + hero.padding(new DocumentInsets(19, 34, 17, 34)) + .spacing(3) + .addParagraph(paragraph -> paragraph + .text(displayName) + .textStyle(nameStyle()) + .align(TextAlign.CENTER) + .lineSpacing(1.0) + .margin(DocumentInsets.zero())); + if (!subline.isBlank()) { + hero.addParagraph(paragraph -> paragraph + .text(subline) + .textStyle(subtitleStyle()) .align(TextAlign.CENTER) - .lineSpacing(1.0) .margin(DocumentInsets.zero())); - if (!subline.isBlank()) { - hero.addParagraph(paragraph -> paragraph - .text(subline) - .textStyle(subtitleStyle()) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero())); - } - }); - } - - private void addContact(PageFlowBuilder flow, CvIdentity identity) { - flow.addSection("CoverLetterV2SidebarPortraitContact", section -> - ContactLine.centered(section, identity, theme, - contactStyle(), contactLinkStyle(), contactStyle())); - } - - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, theme.palette().ink()); - } - - private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeEntryDate(), - DocumentTextDecoration.DEFAULT, theme.palette().ink()); - } - - private DocumentTextStyle contactStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, theme.palette().ink()); - } - - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, theme.palette().muted()); + } + }); + } + + private void addContact(PageFlowBuilder flow, CvIdentity identity) { + flow.addSection("CoverLetterV2SidebarPortraitContact", section -> + ContactLine.centered(section, identity, theme, + contactStyle(), contactLinkStyle(), contactStyle())); + } + + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, theme.palette().ink()); + } + + private DocumentTextStyle subtitleStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntryDate(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + } + + private DocumentTextStyle contactStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + } + + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, theme.palette().muted()); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java index dbe81b7e3..1ecb3fba4 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java @@ -23,11 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** @@ -50,13 +46,19 @@ */ public final class TimelineMinimalLetter { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "timeline-minimal-letter"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Timeline Minimal Letter"; - /** Recommended page margin (in points) — generous business-letter feel. */ + /** + * Recommended page margin (in points) — generous business-letter feel. + */ public static final double RECOMMENDED_MARGIN = 48.0; /** @@ -97,151 +99,145 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CoverLetterDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CoverLetterV2TimelineMinimalRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addRow("CoverLetterV2TimelineMinimalHeader", row -> row - .spacing(3) - .weights(1.00, 0.61) - .addSection("CoverLetterV2TimelineMinimalName", - section -> addNameBlock(section, doc.identity())) - .addSection("CoverLetterV2TimelineMinimalContact", - section -> addContact(section, doc.identity()))) - .addLine(line -> line - .name("CoverLetterV2TimelineMinimalHeaderRule") - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(DocumentInsets.zero())); + public String id() { + return ID; + } - flow.addSection("CoverLetterV2TimelineMinimalBody", host -> - LetterBody.render(host, doc, theme, LETTER_BODY_SIZE)); + @Override + public String displayName() { + return DISPLAY_NAME; + } - flow.build(); - } + @Override + public void compose(DocumentSession document, CoverLetterDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CoverLetterV2TimelineMinimalRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addRow("CoverLetterV2TimelineMinimalHeader", row -> row + .spacing(3) + .weights(1.00, 0.61) + .addSection("CoverLetterV2TimelineMinimalName", + section -> addNameBlock(section, doc.identity())) + .addSection("CoverLetterV2TimelineMinimalContact", + section -> addContact(section, doc.identity()))) + .addLine(line -> line + .name("CoverLetterV2TimelineMinimalHeaderRule") + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(DocumentInsets.zero())); + + flow.addSection("CoverLetterV2TimelineMinimalBody", host -> + LetterBody.render(host, doc, theme, LETTER_BODY_SIZE)); + + flow.build(); + } - private void addNameBlock(SectionBuilder section, CvIdentity identity) { - section.spacing(4) - .addParagraph(paragraph -> paragraph - .text(TextOrnaments.spacedUpper(identity.name().full())) - .textStyle(nameStyle()) + private void addNameBlock(SectionBuilder section, CvIdentity identity) { + section.spacing(4) + .addParagraph(paragraph -> paragraph + .text(TextOrnaments.spacedUpper(identity.name().full())) + .textStyle(nameStyle()) + .margin(DocumentInsets.zero())); + String jobTitle = identity.jobTitle(); + if (!jobTitle.isBlank()) { + section.addParagraph(paragraph -> paragraph + .text(jobTitle.toUpperCase(Locale.ROOT)) + .textStyle(jobTitleStyle()) .margin(DocumentInsets.zero())); - String jobTitle = identity.jobTitle(); - if (!jobTitle.isBlank()) { - section.addParagraph(paragraph -> paragraph - .text(jobTitle.toUpperCase(Locale.ROOT)) - .textStyle(jobTitleStyle()) - .margin(DocumentInsets.zero())); + } } - } - private void addContact(SectionBuilder section, CvIdentity identity) { - section.spacing(3); - DocumentTextStyle textStyle = contactTextStyle(); - DocumentTextStyle fallbackIconStyle = fallbackIconStyle(); - for (ContactItem item : contactItems(identity)) { - section.addParagraph(paragraph -> paragraph - .textStyle(textStyle) - .align(TextAlign.RIGHT) - .link(item.linkOptions()) - .margin(DocumentInsets.zero()) - .rich(rich -> { - rich.style(item.text(), textStyle); - rich.plain(" "); - if (item.iconFile() != null) { - rich.image(contactIcon(item.iconFile()), - CONTACT_ICON_SIZE, - CONTACT_ICON_SIZE, - InlineImageAlignment.CENTER, - CONTACT_ICON_BASELINE_OFFSET, - item.linkOptions()); - } else { - rich.style(item.fallbackIcon(), fallbackIconStyle); - } - })); + private void addContact(SectionBuilder section, CvIdentity identity) { + section.spacing(3); + DocumentTextStyle textStyle = contactTextStyle(); + DocumentTextStyle fallbackIconStyle = fallbackIconStyle(); + for (ContactItem item : contactItems(identity)) { + section.addParagraph(paragraph -> paragraph + .textStyle(textStyle) + .align(TextAlign.RIGHT) + .link(item.linkOptions()) + .margin(DocumentInsets.zero()) + .rich(rich -> { + rich.style(item.text(), textStyle); + rich.plain(" "); + if (item.iconFile() != null) { + rich.image(contactIcon(item.iconFile()), + CONTACT_ICON_SIZE, + CONTACT_ICON_SIZE, + InlineImageAlignment.CENTER, + CONTACT_ICON_BASELINE_OFFSET, + item.linkOptions()); + } else { + rich.style(item.fallbackIcon(), fallbackIconStyle); + } + })); + } } - } - private List contactItems(CvIdentity identity) { - if (identity == null) { - return List.of(); - } - List items = new ArrayList<>(); - addContactItem(items, "LOC", "location.png", - identity.contact().address(), null); - addContactItem(items, "TEL", "phone.png", - identity.contact().phone(), null); - String email = identity.contact().email(); - if (!email.isBlank()) { - addContactItem(items, "@", "email.png", email, - new DocumentLinkOptions("mailto:" + email)); - } - for (CvLink link : identity.links()) { - String label = link.label(); - if (label.isBlank()) { - continue; + private List contactItems(CvIdentity identity) { + if (identity == null) { + return List.of(); + } + List items = new ArrayList<>(); + addContactItem(items, "LOC", "location.png", + identity.contact().address(), null); + addContactItem(items, "TEL", "phone.png", + identity.contact().phone(), null); + String email = identity.contact().email(); + if (!email.isBlank()) { + addContactItem(items, "@", "email.png", email, + new DocumentLinkOptions("mailto:" + email)); } - String url = link.url(); - addContactItem(items, pickFallbackIcon(label), - pickIconFile(label), label, - url.isBlank() ? null : new DocumentLinkOptions(url.trim())); + for (CvLink link : identity.links()) { + String label = link.label(); + if (label.isBlank()) { + continue; + } + String url = link.url(); + addContactItem(items, pickFallbackIcon(label), + pickIconFile(label), label, + url.isBlank() ? null : new DocumentLinkOptions(url.trim())); + } + return List.copyOf(items); } - return List.copyOf(items); - } - private DocumentImageData contactIcon(String iconFile) { - return DocumentImageData.fromBytes( - CONTACT_ICON_CACHE.computeIfAbsent(iconFile, - TimelineMinimalLetter::readIconBytes)); - } + private DocumentImageData contactIcon(String iconFile) { + return DocumentImageData.fromBytes( + CONTACT_ICON_CACHE.computeIfAbsent(iconFile, + TimelineMinimalLetter::readIconBytes)); + } - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.DEFAULT, theme.palette().ink()); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.DEFAULT, theme.palette().ink()); + } - private DocumentTextStyle jobTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), 9.5, - DocumentTextDecoration.BOLD, theme.palette().ink()); - } + private DocumentTextStyle jobTitleStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), 9.5, + DocumentTextDecoration.BOLD, theme.palette().ink()); + } - private DocumentTextStyle contactTextStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.BOLD, theme.palette().muted()); - } + private DocumentTextStyle contactTextStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.BOLD, theme.palette().muted()); + } - private DocumentTextStyle fallbackIconStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), 8.0, - DocumentTextDecoration.BOLD, theme.palette().muted()); + private DocumentTextStyle fallbackIconStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), 8.0, + DocumentTextDecoration.BOLD, theme.palette().muted()); + } } - } private static void addContactItem(List items, String fallbackIcon, String iconFile, 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/v2/components/EntryCompactRenderer.java index 0e2893a33..daf693074 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/v2/components/EntryCompactRenderer.java @@ -21,20 +21,20 @@ private EntryCompactRenderer() { * Renders title and date as a two-column row, then an optional * subtitle line and the body paragraph beneath. * - * @param host host section receiving the entry - * @param entry the entry supplying title, date, subtitle, and body - * @param rowName node name for the title/date row - * @param titleStyle text style for the title column - * @param dateStyle text style for the date column - * @param subtitleStyle text style for the subtitle line - * @param bodyStyle text style for the body paragraph - * @param rowSpacing horizontal spacing between the title and date columns - * @param titleWeight relative weight of the title column - * @param dateWeight relative weight of the date column - * @param subtitleMargin outer margin of the subtitle line - * @param bodyMargin outer margin of the body paragraph + * @param host host section receiving the entry + * @param entry the entry supplying title, date, subtitle, and body + * @param rowName node name for the title/date row + * @param titleStyle text style for the title column + * @param dateStyle text style for the date column + * @param subtitleStyle text style for the subtitle line + * @param bodyStyle text style for the body paragraph + * @param rowSpacing horizontal spacing between the title and date columns + * @param titleWeight relative weight of the title column + * @param dateWeight relative weight of the date column + * @param subtitleMargin outer margin of the subtitle line + * @param bodyMargin outer margin of the body paragraph * @param bodyLineSpacing extra space between wrapped body lines - * @param uppercaseTitle whether the title is upper-cased + * @param uppercaseTitle whether the title is upper-cased */ public static void twoColumnTitleDateBody(SectionBuilder host, CvEntry entry, @@ -151,19 +151,19 @@ public static void slashSubtitleDate(SectionBuilder host, * {@code datePrefix}, then an optional subtitle line and the body * paragraph beneath. * - * @param host host section receiving the entry - * @param entry the entry supplying title, date, subtitle, and body - * @param titleStyle text style for the title - * @param dateStyle text style for the appended date - * @param subtitleStyle text style for the subtitle line - * @param bodyStyle text style for the body paragraph - * @param datePrefix separator inserted between title and date + * @param host host section receiving the entry + * @param entry the entry supplying title, date, subtitle, and body + * @param titleStyle text style for the title + * @param dateStyle text style for the appended date + * @param subtitleStyle text style for the subtitle line + * @param bodyStyle text style for the body paragraph + * @param datePrefix separator inserted between title and date * @param headerLineSpacing extra space between wrapped header lines - * @param headerMargin outer margin of the title/date header - * @param subtitleMargin outer margin of the subtitle line - * @param bodyMargin outer margin of the body paragraph - * @param bodyLineSpacing extra space between wrapped body lines - * @param uppercaseTitle whether the title is upper-cased + * @param headerMargin outer margin of the title/date header + * @param subtitleMargin outer margin of the subtitle line + * @param bodyMargin outer margin of the body paragraph + * @param bodyLineSpacing extra space between wrapped body lines + * @param uppercaseTitle whether the title is upper-cased */ public static void titleDateBody(SectionBuilder host, CvEntry entry, @@ -208,18 +208,18 @@ public static void titleDateBody(SectionBuilder host, * {@code subtitlePrefix} and {@code datePrefix}, then the body * paragraph beneath. * - * @param host host section receiving the entry - * @param entry the entry supplying title, subtitle, date, and body - * @param titleStyle text style for the title - * @param subtitleStyle text style for the appended subtitle - * @param dateStyle text style for the appended date - * @param bodyStyle text style for the body paragraph - * @param subtitlePrefix separator inserted before the subtitle - * @param datePrefix separator inserted before the date + * @param host host section receiving the entry + * @param entry the entry supplying title, subtitle, date, and body + * @param titleStyle text style for the title + * @param subtitleStyle text style for the appended subtitle + * @param dateStyle text style for the appended date + * @param bodyStyle text style for the body paragraph + * @param subtitlePrefix separator inserted before the subtitle + * @param datePrefix separator inserted before the date * @param headerLineSpacing extra space between wrapped header lines - * @param headerMargin outer margin of the header paragraph - * @param bodyMargin outer margin of the body paragraph - * @param bodyLineSpacing extra space between wrapped body lines + * @param headerMargin outer margin of the header paragraph + * @param bodyMargin outer margin of the body paragraph + * @param bodyLineSpacing extra space between wrapped body lines */ public static void titleSubtitleDateBody(SectionBuilder host, CvEntry entry, 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/v2/components/ParagraphPrimitive.java index 1d82756fa..098fa7822 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/v2/components/ParagraphPrimitive.java @@ -75,10 +75,10 @@ static void writeSubtitle(SectionBuilder host, String text, * that need a one-off combination not covered by the convenience * methods above. * - * @param margin paragraph margin - * @param lineSpacing optional lineSpacing override; null = use - * engine default - * @param bulletGlyph optional bullet prefix; null = no bullet + * @param margin paragraph margin + * @param lineSpacing optional lineSpacing override; null = use + * engine default + * @param bulletGlyph optional bullet prefix; null = no bullet */ static void write(SectionBuilder host, String text, DocumentTextStyle style, 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/v2/components/ProjectLabel.java index d5c887669..f1a878f24 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/v2/components/ProjectLabel.java @@ -35,7 +35,9 @@ public record ProjectLabel(String title, String stack) { private static final Pattern TRAILING_STACK = Pattern.compile("\\s+\\(([^()]*)\\)\\s*$"); - /** Normalises null title and stack to empty strings. */ + /** + * Normalises null title and stack to empty strings. + */ public ProjectLabel { title = title == null ? "" : title; stack = stack == null ? "" : stack; 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/v2/components/SectionDispatcher.java index 2c759c79c..512d8347d 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/v2/components/SectionDispatcher.java @@ -1,13 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.components; import com.demcha.compose.document.dsl.SectionBuilder; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -import com.demcha.compose.document.templates.cv.v2.data.SkillsSection; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; /** 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/v2/components/SectionLookup.java index 9543e4a50..7686d0139 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/v2/components/SectionLookup.java @@ -1,10 +1,6 @@ package com.demcha.compose.document.templates.cv.v2.components; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -import com.demcha.compose.document.templates.cv.v2.data.SkillsSection; +import com.demcha.compose.document.templates.cv.v2.data.*; import java.util.List; @@ -48,7 +44,7 @@ public static CvSection firstMatching(List sections, * * @param section the section to inspect * @return {@code true} if the section has non-empty body, entries, - * rows, or skill groups + * rows, or skill groups */ public static boolean hasContent(CvSection section) { if (section instanceof ParagraphSection paragraph) { 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/v2/components/SkillLineRenderer.java index 75c738263..d108a2e82 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/v2/components/SkillLineRenderer.java @@ -48,7 +48,7 @@ public static void limitedInline(SectionBuilder host, .margin(margin) .rich(rich -> { rich.style(MarkdownInline.plainText(group.category()) - + labelSuffix, labelStyle); + + labelSuffix, labelStyle); rich.style(String.join(", ", skills), valueStyle); })); } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/TextOrnaments.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/TextOrnaments.java index 14af837c9..bca437e11 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/TextOrnaments.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/TextOrnaments.java @@ -34,8 +34,8 @@ public static String spacedUpper(String value) { char current = upper.charAt(i); out.append(current); if (Character.isLetterOrDigit(current) - && i + 1 < upper.length() - && Character.isLetterOrDigit(upper.charAt(i + 1))) { + && i + 1 < upper.length() + && Character.isLetterOrDigit(upper.charAt(i + 1))) { out.append(' '); } else if (Character.isWhitespace(current)) { out.append(" "); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvContact.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvContact.java index 3db3cbd67..ef8543d9f 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvContact.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvContact.java @@ -15,7 +15,9 @@ */ public record CvContact(String phone, String email, String address) { - /** Validates that every field is non-null and non-blank. */ + /** + * Validates that every field is non-null and non-blank. + */ public CvContact { Objects.requireNonNull(phone, "phone"); Objects.requireNonNull(email, "email"); 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/v2/data/CvDocument.java index 7205f4cd0..d9f7574da 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/v2/data/CvDocument.java @@ -51,9 +51,9 @@ public record CvDocument(CvIdentity identity, List placements) { * @param sections sections to wrap, each in a {@link Slot#MAIN} * placement, in source order * @return a {@code CvDocument} with every section placed in - * {@link Slot#MAIN} + * {@link Slot#MAIN} * @deprecated since the slot model — prefer the {@link Builder} - * so non-MAIN slots are visible at the call site. + * so non-MAIN slots are visible at the call site. */ @Deprecated public static CvDocument ofMainSections(CvIdentity identity, @@ -69,7 +69,9 @@ public static CvDocument ofMainSections(CvIdentity identity, */ public record Placement(Slot slot, CvSection section) { - /** Validates that both fields are non-null. */ + /** + * Validates that both fields are non-null. + */ public Placement { Objects.requireNonNull(slot, "slot"); Objects.requireNonNull(section, "section"); @@ -123,7 +125,7 @@ public List sectionsIn(Slot slot) { * * @param section section instance to look up * @return its slot, or {@link Slot#MAIN} if the section is not - * in this document + * in this document */ public Slot slotOf(CvSection section) { Objects.requireNonNull(section, "section"); 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/v2/data/CvEntry.java index 2985658e6..8b7f44354 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/v2/data/CvEntry.java @@ -22,7 +22,9 @@ */ public record CvEntry(String title, String subtitle, String date, String body) { - /** Validates that every field is non-null and that {@code title} is non-blank. */ + /** + * Validates that every field is non-null and that {@code title} is non-blank. + */ public CvEntry { Objects.requireNonNull(title, "title"); Objects.requireNonNull(subtitle, "subtitle"); 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/v2/data/CvIdentity.java index b5b3c7766..f99eadcaf 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/v2/data/CvIdentity.java @@ -14,8 +14,8 @@ * builder's {@code link(...)} method — added when the author wants * them, simply omitted otherwise.

* - * @param name structured name with first / last required and an - * optional middle component + * @param name structured name with first / last required and an + * optional middle component * @param jobTitle optional professional title rendered by presets * that have a subtitle line; blank when absent * @param contact phone / email / address — all three required diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvLink.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvLink.java index 95ef21961..6d5928efb 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvLink.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/data/CvLink.java @@ -11,7 +11,9 @@ */ public record CvLink(String label, String url) { - /** Validates that both fields are non-null and non-blank. */ + /** + * Validates that both fields are non-null and non-blank. + */ public CvLink { Objects.requireNonNull(label, "label"); Objects.requireNonNull(url, "url"); 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/v2/data/CvName.java index 60cd25f9e..c1a26951a 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/v2/data/CvName.java @@ -48,7 +48,7 @@ public static CvName of(String first, String last) { * Optional middle component, absent when blank. * * @return middle wrapped in {@link Optional#empty()} when blank, - * otherwise the middle name + * otherwise the middle name */ public Optional middleName() { return middle.isBlank() ? Optional.empty() : Optional.of(middle); 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/v2/data/CvRow.java index 1d810c993..3a12cc6a7 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/v2/data/CvRow.java @@ -21,7 +21,9 @@ */ public record CvRow(String label, String body) { - /** Validates that every field is non-null and that {@code label} is non-blank. */ + /** + * Validates that every field is non-null and that {@code label} is non-blank. + */ public CvRow { Objects.requireNonNull(label, "label"); Objects.requireNonNull(body, "body"); 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/v2/data/CvSection.java index 028358d4b..d4843e396 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/v2/data/CvSection.java @@ -29,7 +29,7 @@ public sealed interface CvSection * Banner heading shown above this section's body. * * @return banner heading shown above the body (non-blank by - * construction) + * construction) */ String title(); } 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/v2/data/ParagraphSection.java index a12259b12..87e100721 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/v2/data/ParagraphSection.java @@ -15,7 +15,9 @@ */ public record ParagraphSection(String title, String body) implements CvSection { - /** Validates that every field is non-null and that {@code title} is non-blank. */ + /** + * Validates that every field is non-null and that {@code title} is non-blank. + */ public ParagraphSection { Objects.requireNonNull(title, "title"); Objects.requireNonNull(body, "body"); 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/v2/data/Slot.java index da501d657..5faf7740b 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/v2/data/Slot.java @@ -19,10 +19,14 @@ */ public enum Slot { - /** Primary content column. Default when no slot is specified. */ + /** + * Primary content column. Default when no slot is specified. + */ MAIN, - /** Sidebar / secondary column — typically narrower than MAIN. */ + /** + * Sidebar / secondary column — typically narrower than MAIN. + */ SIDEBAR, /** diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java index 23fd6ba3a..e3252dcd1 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java @@ -8,23 +8,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.EntryCompactRenderer; -import com.demcha.compose.document.templates.cv.v2.components.ParagraphRenderer; -import com.demcha.compose.document.templates.cv.v2.components.ProjectRenderer; -import com.demcha.compose.document.templates.cv.v2.components.RowRenderer; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.SkillsRenderer; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.components.*; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; import com.demcha.compose.document.templates.cv.v2.widgets.FlowSectionHeader; @@ -49,13 +34,19 @@ */ public final class BlueBanner { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "blue-banner"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Blue Banner"; - /** Recommended page margin (in points). */ + /** + * Recommended page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 28.0; private static final double BANNER_RULE_WIDTH = 500.0; @@ -100,62 +91,56 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - DocumentTextStyle bannerTitleStyle = CvTextStyles.of( - theme.typography().bodyFont(), - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - BANNER_TEXT); - - PageFlowBuilder pageFlow = document.dsl() - .pageFlow() - .name("CvV2BlueBannerRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("Header", section -> - Headline.spacedCentered(section, - doc.identity().name(), theme)) - .addSection("Contact", section -> - ContactLine.centered(section, doc.identity(), theme)); - - List sections = orderedSections(doc); - for (int i = 0; i < sections.size(); i++) { - final CvSection sec = sections.get(i); - final int idx = i; - FlowSectionHeader.banner(pageFlow, "BlueBannerTitle_" + idx, - sec.title(), BANNER_RULE_WIDTH, theme, bannerTitleStyle, - new DocumentInsets(3, BANNER_RULE_HORIZONTAL_INSET, - 1, BANNER_RULE_HORIZONTAL_INSET), - new DocumentInsets(1, BANNER_RULE_HORIZONTAL_INSET, - 1, BANNER_RULE_HORIZONTAL_INSET)); - pageFlow.addSection("BlueBannerBody_" + idx, host -> - renderBody(host, sec, theme)); + @Override + public String displayName() { + return DISPLAY_NAME; } - pageFlow.build(); + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + DocumentTextStyle bannerTitleStyle = CvTextStyles.of( + theme.typography().bodyFont(), + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + BANNER_TEXT); + + PageFlowBuilder pageFlow = document.dsl() + .pageFlow() + .name("CvV2BlueBannerRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("Header", section -> + Headline.spacedCentered(section, + doc.identity().name(), theme)) + .addSection("Contact", section -> + ContactLine.centered(section, doc.identity(), theme)); + + List sections = orderedSections(doc); + for (int i = 0; i < sections.size(); i++) { + final CvSection sec = sections.get(i); + final int idx = i; + FlowSectionHeader.banner(pageFlow, "BlueBannerTitle_" + idx, + sec.title(), BANNER_RULE_WIDTH, theme, bannerTitleStyle, + new DocumentInsets(3, BANNER_RULE_HORIZONTAL_INSET, + 1, BANNER_RULE_HORIZONTAL_INSET), + new DocumentInsets(1, BANNER_RULE_HORIZONTAL_INSET, + 1, BANNER_RULE_HORIZONTAL_INSET)); + pageFlow.addSection("BlueBannerBody_" + idx, host -> + renderBody(host, sec, theme)); + } + + pageFlow.build(); + } } - } private static void renderBody(SectionBuilder host, CvSection section, diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BoxedSections.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BoxedSections.java index 185ca3735..591b0d9c1 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BoxedSections.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BoxedSections.java @@ -4,13 +4,13 @@ import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.cv.v2.components.SectionDispatcher; -import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; -import com.demcha.compose.document.templates.cv.v2.widgets.Headline; -import com.demcha.compose.document.templates.cv.v2.widgets.SectionHeader; import com.demcha.compose.document.templates.cv.v2.data.CvDocument; import com.demcha.compose.document.templates.cv.v2.data.CvSection; import com.demcha.compose.document.templates.cv.v2.data.Slot; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; +import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; +import com.demcha.compose.document.templates.cv.v2.widgets.Headline; +import com.demcha.compose.document.templates.cv.v2.widgets.SectionHeader; import java.util.List; import java.util.Objects; @@ -41,13 +41,19 @@ */ public final class BoxedSections { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "boxed-sections"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Boxed Sections"; - /** Recommended page margin (in points). */ + /** + * Recommended page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 28.0; private BoxedSections() { @@ -77,58 +83,52 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - PageFlowBuilder pageFlow = document.dsl() - .pageFlow() - .name("CvV2Root") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("CvV2Headline", section -> { - section.accentBottom(theme.palette().rule(), - theme.spacing().accentRuleWidth()); - Headline.spacedCentered(section, doc.identity().name(), theme); - }) - .addSection("CvV2Contact", section -> { - section.accentBottom(theme.palette().rule(), - theme.spacing().accentRuleWidth()); - ContactLine.centered(section, doc.identity(), theme); - }); - - // Single-column preset — only renders MAIN-slot sections. - // Sidebar / footer placements are intentionally dropped here; - // switch to a multi-column preset to render them. - List sections = doc.sectionsIn(Slot.MAIN); - for (int i = 0; i < sections.size(); i++) { - final CvSection sec = sections.get(i); - final int idx = i; - pageFlow.addSection("CvV2Banner_" + idx, - host -> SectionHeader.banner(host, sec.title(), theme)); - pageFlow.addSection("CvV2Body_" + idx, - host -> SectionDispatcher.renderBody(host, sec, theme)); + @Override + public String displayName() { + return DISPLAY_NAME; } - pageFlow.build(); + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + PageFlowBuilder pageFlow = document.dsl() + .pageFlow() + .name("CvV2Root") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("CvV2Headline", section -> { + section.accentBottom(theme.palette().rule(), + theme.spacing().accentRuleWidth()); + Headline.spacedCentered(section, doc.identity().name(), theme); + }) + .addSection("CvV2Contact", section -> { + section.accentBottom(theme.palette().rule(), + theme.spacing().accentRuleWidth()); + ContactLine.centered(section, doc.identity(), theme); + }); + + // Single-column preset — only renders MAIN-slot sections. + // Sidebar / footer placements are intentionally dropped here; + // switch to a multi-column preset to render them. + List sections = doc.sectionsIn(Slot.MAIN); + for (int i = 0; i < sections.size(); i++) { + final CvSection sec = sections.get(i); + final int idx = i; + pageFlow.addSection("CvV2Banner_" + idx, + host -> SectionHeader.banner(host, sec.title(), theme)); + pageFlow.addSection("CvV2Body_" + idx, + host -> SectionDispatcher.renderBody(host, sec, theme)); + } + + pageFlow.build(); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CenteredHeadline.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CenteredHeadline.java index 517ac9444..e0852e555 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CenteredHeadline.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CenteredHeadline.java @@ -1,6 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.presets; import com.demcha.compose.document.api.DocumentSession; +import com.demcha.compose.document.dsl.LineBuilder; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.style.DocumentInsets; @@ -9,12 +10,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.cv.v2.components.ProjectRenderer; import com.demcha.compose.document.templates.cv.v2.components.SectionDispatcher; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -import com.demcha.compose.document.templates.cv.v2.data.RowsSection; -import com.demcha.compose.document.templates.cv.v2.data.RowStyle; -import com.demcha.compose.document.templates.cv.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; @@ -64,13 +60,19 @@ */ public final class CenteredHeadline { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "centered-headline"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Centered Headline"; - /** Recommended page margin (in points) — matches the legacy v1 preset. */ + /** + * Recommended page margin (in points) — matches the legacy v1 preset. + */ public static final double RECOMMENDED_MARGIN = 28.0; /** @@ -107,121 +109,115 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } + public String id() { + return ID; + } - @Override - public String displayName() { - return DISPLAY_NAME; - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double ruleWidth = document.canvas().innerWidth(); - - // -- name + subheadline + contact, framed by thin rules ---- - PageFlowBuilder pageFlow = document.dsl() - .pageFlow() - .name("CenteredHeadlineRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("Headline", section -> { - Headline.spacedCentered(section, doc.identity().name(), theme); - Subheadline.centeredSpacedCaps(section, SUBHEADLINE_CAPTION, - subheadlineStyle()); - }) - .addLine(line -> rule(line, "HeadlineRule", ruleWidth, 7, 0)) - .addSection("Contact", - section -> ContactLine.centered(section, doc.identity(), theme)) - .addLine(line -> rule(line, "ContactRule", ruleWidth, 0, 8)); - - // -- sections — flatSpacedCaps title, dispatched body, - // thin inter-module rule between consecutive sections. - List sections = doc.sectionsIn(Slot.MAIN); - for (int i = 0; i < sections.size(); i++) { - final CvSection sec = sections.get(i); - final int idx = i; - pageFlow.addSection("Title_" + idx, host -> - SectionHeader.flatSpacedCaps(host, sec.title(), - theme.palette().muted(), theme, null)); - pageFlow.addLine(line -> - rule(line, "TitleBottomRule_" + idx, ruleWidth, 8, 8)); - pageFlow.addSection("Body_" + idx, host -> - renderBody(host, sec)); - if (idx < sections.size() - 1) { + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double ruleWidth = document.canvas().innerWidth(); + + // -- name + subheadline + contact, framed by thin rules ---- + PageFlowBuilder pageFlow = document.dsl() + .pageFlow() + .name("CenteredHeadlineRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("Headline", section -> { + Headline.spacedCentered(section, doc.identity().name(), theme); + Subheadline.centeredSpacedCaps(section, SUBHEADLINE_CAPTION, + subheadlineStyle()); + }) + .addLine(line -> rule(line, "HeadlineRule", ruleWidth, 7, 0)) + .addSection("Contact", + section -> ContactLine.centered(section, doc.identity(), theme)) + .addLine(line -> rule(line, "ContactRule", ruleWidth, 0, 8)); + + // -- sections — flatSpacedCaps title, dispatched body, + // thin inter-module rule between consecutive sections. + List sections = doc.sectionsIn(Slot.MAIN); + for (int i = 0; i < sections.size(); i++) { + final CvSection sec = sections.get(i); + final int idx = i; + pageFlow.addSection("Title_" + idx, host -> + SectionHeader.flatSpacedCaps(host, sec.title(), + theme.palette().muted(), theme, null)); pageFlow.addLine(line -> - rule(line, "InterModuleRule_" + idx, ruleWidth, 5, 8)); + rule(line, "TitleBottomRule_" + idx, ruleWidth, 8, 8)); + pageFlow.addSection("Body_" + idx, host -> + renderBody(host, sec)); + if (idx < sections.size() - 1) { + pageFlow.addLine(line -> + rule(line, "InterModuleRule_" + idx, ruleWidth, 5, 8)); + } } - } - pageFlow.build(); - } + pageFlow.build(); + } - private void renderBody(SectionBuilder host, CvSection sec) { - if (sec instanceof RowsSection rows + private void renderBody(SectionBuilder host, CvSection sec) { + if (sec instanceof RowsSection rows && rows.style() == RowStyle.BULLETED_STACKED) { - host.spacing(theme.spacing().sectionBodySpacing()) - .padding(theme.spacing().sectionBodyPadding()); - for (int i = 0; i < rows.rows().size(); i++) { - if (i > 0) { - host.spacer(0, theme.spacing().entrySeparation()); + host.spacing(theme.spacing().sectionBodySpacing()) + .padding(theme.spacing().sectionBodyPadding()); + for (int i = 0; i < rows.rows().size(); i++) { + if (i > 0) { + host.spacer(0, theme.spacing().entrySeparation()); + } + renderStackedProject(host, rows.rows().get(i)); } - renderStackedProject(host, rows.rows().get(i)); + return; } - return; + SectionDispatcher.renderBody(host, sec, theme); } - SectionDispatcher.renderBody(host, sec, theme); - } - private void renderStackedProject(SectionBuilder host, CvRow row) { - ProjectRenderer.titleThenBody(host, row, theme.bodyBoldStyle(), - theme.bodyBoldStyle(), theme.bodyStyle(), - theme.typography().bodyLineSpacing(), - DocumentInsets.top((float) theme.spacing().paragraphMarginTop()), - DocumentInsets.zero()); - } + private void renderStackedProject(SectionBuilder host, CvRow row) { + ProjectRenderer.titleThenBody(host, row, theme.bodyBoldStyle(), + theme.bodyBoldStyle(), theme.bodyStyle(), + theme.typography().bodyLineSpacing(), + DocumentInsets.top((float) theme.spacing().paragraphMarginTop()), + DocumentInsets.zero()); + } - /** - * Builds the subheadline text style. Inlined here (not a theme - * slot) because no other widget reaches for this exact - * combination — Subheadline takes the style as a parameter so - * presets stay in control of the visual weight of their - * captions. - */ - private DocumentTextStyle subheadlineStyle() { - return DocumentTextStyle.builder() - .fontName(theme.typography().headlineFont()) - .size(8.6) - .decoration(DocumentTextDecoration.DEFAULT) - .color(theme.palette().muted()) - .build(); - } + /** + * Builds the subheadline text style. Inlined here (not a theme + * slot) because no other widget reaches for this exact + * combination — Subheadline takes the style as a parameter so + * presets stay in control of the visual weight of their + * captions. + */ + private DocumentTextStyle subheadlineStyle() { + return DocumentTextStyle.builder() + .fontName(theme.typography().headlineFont()) + .size(8.6) + .decoration(DocumentTextDecoration.DEFAULT) + .color(theme.palette().muted()) + .build(); + } - /** - * Configure a thin full-width horizontal rule. The widths and - * margin pattern match the v1 preset exactly: top inset - * creates breathing room above the rule, bottom inset before - * the next paragraph. - */ - private void rule(com.demcha.compose.document.dsl.LineBuilder line, - String name, double width, double top, double bottom) { - line.name(name) - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(new DocumentInsets(top, 0, bottom, 0)); + /** + * Configure a thin full-width horizontal rule. The widths and + * margin pattern match the v1 preset exactly: top inset + * creates breathing room above the rule, bottom inset before + * the next paragraph. + */ + private void rule(LineBuilder line, + String name, double width, double top, double bottom) { + line.name(name) + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(new DocumentInsets(top, 0, bottom, 0)); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java index 76ecf8447..3c380d3c3 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java @@ -9,23 +9,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.EntryCompactRenderer; -import com.demcha.compose.document.templates.cv.v2.components.LabelValueRenderer; -import com.demcha.compose.document.templates.cv.v2.components.ProjectRenderer; -import com.demcha.compose.document.templates.cv.v2.components.RichParagraphRenderer; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.components.*; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; @@ -49,13 +34,19 @@ */ public final class ClassicSerif { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "classic-serif"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Classic Serif"; - /** Recommended page margin (in points). */ + /** + * Recommended page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 20.0; private static final DocumentColor ACCENT = @@ -97,255 +88,249 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } + public String id() { + return ID; + } - @Override - public String displayName() { - return DISPLAY_NAME; - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - List sections = doc.sectionsIn(Slot.MAIN); - - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CvV2ClassicSerifRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - addHeader(flow, doc, width); - addSummary(flow, SectionLookup.firstMatching(sections, SUMMARY_KEYS)); - addCoverSkillsModule(flow, SectionLookup.firstMatching(sections, SKILL_KEYS)); - addLinearModule(flow, "Experience", - SectionLookup.firstMatching(sections, EXPERIENCE_KEYS)); - addLinearModule(flow, "Projects", - SectionLookup.firstMatching(sections, PROJECT_KEYS)); - addLinearModule(flow, "Education", - SectionLookup.firstMatching(sections, EDUCATION_KEYS)); - addLinearModule(flow, "Additional", - SectionLookup.firstMatching(sections, ADDITIONAL_KEYS)); - flow.build(); - } + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + List sections = doc.sectionsIn(Slot.MAIN); + + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CvV2ClassicSerifRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + addHeader(flow, doc, width); + addSummary(flow, SectionLookup.firstMatching(sections, SUMMARY_KEYS)); + addCoverSkillsModule(flow, SectionLookup.firstMatching(sections, SKILL_KEYS)); + addLinearModule(flow, "Experience", + SectionLookup.firstMatching(sections, EXPERIENCE_KEYS)); + addLinearModule(flow, "Projects", + SectionLookup.firstMatching(sections, PROJECT_KEYS)); + addLinearModule(flow, "Education", + SectionLookup.firstMatching(sections, EDUCATION_KEYS)); + addLinearModule(flow, "Additional", + SectionLookup.firstMatching(sections, ADDITIONAL_KEYS)); + flow.build(); + } - private void addHeader(PageFlowBuilder flow, CvDocument doc, - double width) { - flow.addSection("CvV2ClassicSerifHeader", section -> { - section.spacing(5); - Headline.spacedCentered(section, doc.identity().name(), theme); - section.addLine(line -> line - .name("CvV2ClassicSerifHeaderRule") - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(new DocumentInsets(1, 0, 0, 0))); - ContactLine.centered(section, doc.identity(), theme, - contactMetaStyle(), contactLinkStyle(), - contactSeparatorStyle()); - }); - } + private void addHeader(PageFlowBuilder flow, CvDocument doc, + double width) { + flow.addSection("CvV2ClassicSerifHeader", section -> { + section.spacing(5); + Headline.spacedCentered(section, doc.identity().name(), theme); + section.addLine(line -> line + .name("CvV2ClassicSerifHeaderRule") + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(new DocumentInsets(1, 0, 0, 0))); + ContactLine.centered(section, doc.identity(), theme, + contactMetaStyle(), contactLinkStyle(), + contactSeparatorStyle()); + }); + } - private void addSummary(PageFlowBuilder flow, CvSection section) { - if (!(section instanceof ParagraphSection summary) + private void addSummary(PageFlowBuilder flow, CvSection section) { + if (!(section instanceof ParagraphSection summary) || summary.body().isBlank()) { - return; + return; + } + + flow.addSection("CvV2ClassicSerifSummary", host -> { + host.spacing(5) + .padding(new DocumentInsets(12, 18, 13, 18)) + .fillColor(theme.palette().banner()) + .accentTop(ACCENT, 1.15) + .accentBottom(theme.palette().rule(), 0.45); + addCenteredTitle(host, "Professional Profile"); + RichParagraphRenderer.render(host, summary.body(), + CvTextStyles.of(theme.typography().bodyFont(), 9.8, + DocumentTextDecoration.DEFAULT, + theme.palette().ink()), + 1.55, DocumentInsets.zero(), TextAlign.CENTER); + }); } - flow.addSection("CvV2ClassicSerifSummary", host -> { - host.spacing(5) - .padding(new DocumentInsets(12, 18, 13, 18)) - .fillColor(theme.palette().banner()) - .accentTop(ACCENT, 1.15) - .accentBottom(theme.palette().rule(), 0.45); - addCenteredTitle(host, "Professional Profile"); - RichParagraphRenderer.render(host, summary.body(), - CvTextStyles.of(theme.typography().bodyFont(), 9.8, - DocumentTextDecoration.DEFAULT, - theme.palette().ink()), - 1.55, DocumentInsets.zero(), TextAlign.CENTER); - }); - } + private void addCoverSkillsModule(PageFlowBuilder flow, CvSection section) { + if (!SectionLookup.hasContent(section)) { + return; + } - private void addCoverSkillsModule(PageFlowBuilder flow, CvSection section) { - if (section == null || !SectionLookup.hasContent(section)) { - return; + flow.addSection("CvV2ClassicSerifCoreSkills", host -> { + host.spacing(theme.spacing().sectionBodySpacing()) + .padding(new DocumentInsets(0, 0, 2, 0)); + SectionHeader.spacedCapsRule(host, "Core Skills", theme, + titleStyle(), ACCENT, 72, 1.0, + new DocumentInsets(0, 0, 2, 0)); + renderCoverSkillsBody(host, section); + }); } - flow.addSection("CvV2ClassicSerifCoreSkills", host -> { - host.spacing(theme.spacing().sectionBodySpacing()) - .padding(new DocumentInsets(0, 0, 2, 0)); - SectionHeader.spacedCapsRule(host, "Core Skills", theme, - titleStyle(), ACCENT, 72, 1.0, - new DocumentInsets(0, 0, 2, 0)); - renderCoverSkillsBody(host, section); - }); - } - - private void renderCoverSkillsBody(SectionBuilder host, - CvSection section) { - if (section instanceof SkillsSection skills) { - for (SkillGroup group : skills.groups()) { - renderTightKeyValue(host, - new CvRow(group.category(), group.skillsInline())); + private void renderCoverSkillsBody(SectionBuilder host, + CvSection section) { + if (section instanceof SkillsSection skills) { + for (SkillGroup group : skills.groups()) { + renderTightKeyValue(host, + new CvRow(group.category(), group.skillsInline())); + } + return; } - return; + renderDetailBody(host, section); } - renderDetailBody(host, section); - } - private void addLinearModule(PageFlowBuilder flow, String title, - CvSection section) { - if (section == null || !SectionLookup.hasContent(section)) { - return; - } + private void addLinearModule(PageFlowBuilder flow, String title, + CvSection section) { + if (!SectionLookup.hasContent(section)) { + return; + } - flow.addSection("CvV2ClassicSerif" + SectionLookup.normalize(title), host -> { - host.spacing(theme.spacing().sectionBodySpacing()) - .padding(new DocumentInsets(0, 0, 2, 0)); - SectionHeader.spacedCapsRule(host, title, theme, - titleStyle(), ACCENT, 72, 1.0, - new DocumentInsets(0, 0, 2, 0)); - renderDetailBody(host, section); - }); - } + flow.addSection("CvV2ClassicSerif" + SectionLookup.normalize(title), host -> { + host.spacing(theme.spacing().sectionBodySpacing()) + .padding(new DocumentInsets(0, 0, 2, 0)); + SectionHeader.spacedCapsRule(host, title, theme, + titleStyle(), ACCENT, 72, 1.0, + new DocumentInsets(0, 0, 2, 0)); + renderDetailBody(host, section); + }); + } - private void renderDetailBody(SectionBuilder host, CvSection section) { - if (section instanceof ParagraphSection paragraph) { - RichParagraphRenderer.render(host, paragraph.body(), - theme.bodyStyle(), - theme.typography().bodyLineSpacing(), - DocumentInsets.top(theme.spacing().paragraphMarginTop())); - } else if (section instanceof EntriesSection entries) { - renderEntries(host, entries); - } else if (section instanceof RowsSection rows) { - renderRows(host, rows); - } else if (section instanceof SkillsSection skills) { - for (SkillGroup group : skills.groups()) { - renderKeyValue(host, - new CvRow(group.category(), group.skillsInline())); + private void renderDetailBody(SectionBuilder host, CvSection section) { + if (section instanceof ParagraphSection paragraph) { + RichParagraphRenderer.render(host, paragraph.body(), + theme.bodyStyle(), + theme.typography().bodyLineSpacing(), + DocumentInsets.top(theme.spacing().paragraphMarginTop())); + } else if (section instanceof EntriesSection entries) { + renderEntries(host, entries); + } else if (section instanceof RowsSection rows) { + renderRows(host, rows); + } else if (section instanceof SkillsSection skills) { + for (SkillGroup group : skills.groups()) { + renderKeyValue(host, + new CvRow(group.category(), group.skillsInline())); + } + } else { + throw new IllegalStateException( + "Unknown CvSection subtype: " + + section.getClass().getName()); } - } else { - throw new IllegalStateException( - "Unknown CvSection subtype: " - + section.getClass().getName()); } - } - private void renderEntries(SectionBuilder host, EntriesSection entries) { - for (int i = 0; i < entries.entries().size(); i++) { - if (i > 0) { - host.spacer(0, theme.spacing().entrySeparation()); + private void renderEntries(SectionBuilder host, EntriesSection entries) { + for (int i = 0; i < entries.entries().size(); i++) { + if (i > 0) { + host.spacer(0, theme.spacing().entrySeparation()); + } + renderEntry(host, entries.entries().get(i)); } - renderEntry(host, entries.entries().get(i)); } - } - private void renderEntry(SectionBuilder host, CvEntry entry) { - EntryCompactRenderer.twoColumnTitleDateBody(host, entry, - "CvV2ClassicSerifEntryHeader", - theme.entryTitleStyle(), theme.entryDateStyle(), - theme.entrySubtitleStyle(), - CvTextStyles.of(theme.typography().bodyFont(), 8.8, - DocumentTextDecoration.DEFAULT, - theme.palette().ink()), - theme.spacing().entryHeaderRowSpacing(), - theme.spacing().entryTitleWeight(), - theme.spacing().entryDateWeight(), - DocumentInsets.zero(), - DocumentInsets.top(theme.spacing().paragraphMarginTop()), - theme.typography().bodyLineSpacing(), - false); - } + private void renderEntry(SectionBuilder host, CvEntry entry) { + EntryCompactRenderer.twoColumnTitleDateBody(host, entry, + "CvV2ClassicSerifEntryHeader", + theme.entryTitleStyle(), theme.entryDateStyle(), + theme.entrySubtitleStyle(), + CvTextStyles.of(theme.typography().bodyFont(), 8.8, + DocumentTextDecoration.DEFAULT, + theme.palette().ink()), + theme.spacing().entryHeaderRowSpacing(), + theme.spacing().entryTitleWeight(), + theme.spacing().entryDateWeight(), + DocumentInsets.zero(), + DocumentInsets.top(theme.spacing().paragraphMarginTop()), + theme.typography().bodyLineSpacing(), + false); + } - private void renderRows(SectionBuilder host, RowsSection rows) { - boolean projects = SectionLookup.titleContains(rows.title(), "project"); - for (int i = 0; i < rows.rows().size(); i++) { - if (i > 0) { - host.spacer(0, theme.spacing().entrySeparation()); - } - if (projects) { - renderProject(host, rows.rows().get(i)); - } else { - renderKeyValue(host, rows.rows().get(i)); + private void renderRows(SectionBuilder host, RowsSection rows) { + boolean projects = SectionLookup.titleContains(rows.title(), "project"); + for (int i = 0; i < rows.rows().size(); i++) { + if (i > 0) { + host.spacer(0, theme.spacing().entrySeparation()); + } + if (projects) { + renderProject(host, rows.rows().get(i)); + } else { + renderKeyValue(host, rows.rows().get(i)); + } } } - } - private void renderProject(SectionBuilder host, CvRow row) { - ProjectRenderer.titleThenBody(host, row, theme.entryTitleStyle(), - CvTextStyles.of(theme.typography().bodyFont(), 8.7, - DocumentTextDecoration.ITALIC, - theme.palette().muted()), - CvTextStyles.of(theme.typography().bodyFont(), 8.8, - DocumentTextDecoration.DEFAULT, - theme.palette().ink()), - theme.typography().bodyLineSpacing(), - DocumentInsets.top(theme.spacing().paragraphMarginTop()), - DocumentInsets.zero()); - } + private void renderProject(SectionBuilder host, CvRow row) { + ProjectRenderer.titleThenBody(host, row, theme.entryTitleStyle(), + CvTextStyles.of(theme.typography().bodyFont(), 8.7, + DocumentTextDecoration.ITALIC, + theme.palette().muted()), + CvTextStyles.of(theme.typography().bodyFont(), 8.8, + DocumentTextDecoration.DEFAULT, + theme.palette().ink()), + theme.typography().bodyLineSpacing(), + DocumentInsets.top(theme.spacing().paragraphMarginTop()), + DocumentInsets.zero()); + } - private void renderKeyValue(SectionBuilder host, CvRow row) { - LabelValueRenderer.render(host, row.label(), row.body(), - theme.bodyBoldStyle(), theme.bodyStyle(), - theme.typography().bodyLineSpacing(), - DocumentInsets.top(theme.spacing().paragraphMarginTop())); - } + private void renderKeyValue(SectionBuilder host, CvRow row) { + LabelValueRenderer.render(host, row.label(), row.body(), + theme.bodyBoldStyle(), theme.bodyStyle(), + theme.typography().bodyLineSpacing(), + DocumentInsets.top(theme.spacing().paragraphMarginTop())); + } - private void renderTightKeyValue(SectionBuilder host, CvRow row) { - LabelValueRenderer.render(host, row.label(), row.body(), - theme.bodyBoldStyle(), theme.bodyStyle(), - theme.typography().bodyLineSpacing(), - DocumentInsets.zero()); - } + private void renderTightKeyValue(SectionBuilder host, CvRow row) { + LabelValueRenderer.render(host, row.label(), row.body(), + theme.bodyBoldStyle(), theme.bodyStyle(), + theme.typography().bodyLineSpacing(), + DocumentInsets.zero()); + } - private void addCenteredTitle(SectionBuilder host, String title) { - host.addParagraph(paragraph -> paragraph - .text(TextOrnaments.spacedUpper(title)) - .textStyle(titleStyle()) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero())); - } + private void addCenteredTitle(SectionBuilder host, String title) { + host.addParagraph(paragraph -> paragraph + .text(TextOrnaments.spacedUpper(title)) + .textStyle(titleStyle()) + .align(TextAlign.CENTER) + .margin(DocumentInsets.zero())); + } - private DocumentTextStyle titleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - ACCENT); - } + private DocumentTextStyle titleStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + ACCENT); + } - private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().muted()); - } + private DocumentTextStyle contactMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().muted()); + } - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - ACCENT); - } + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + ACCENT); + } - private DocumentTextStyle contactSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().rule()); + private DocumentTextStyle contactSeparatorStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().rule()); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java index ed6b07c32..08ccef5ca 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java @@ -3,29 +3,10 @@ import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.EntryCompactRenderer; -import com.demcha.compose.document.templates.cv.v2.components.LabelValueRenderer; -import com.demcha.compose.document.templates.cv.v2.components.ProjectRenderer; -import com.demcha.compose.document.templates.cv.v2.components.RichParagraphRenderer; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.SkillLineRenderer; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.components.*; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; @@ -54,13 +35,19 @@ */ public final class CompactMono { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "compact-mono"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Compact Mono"; - /** Recommended page margin (in points). */ + /** + * Recommended page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 20.0; private static final DocumentColor PAPER = @@ -116,267 +103,261 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - List sections = doc.sectionsIn(Slot.MAIN); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CvV2CompactMonoRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .fillColor(PAPER); - - addHeader(flow, doc, document.canvas().innerWidth()); - flow.addRow("CvV2CompactMonoBody", row -> row - .spacing(14) - .weights(0.78, 1.62) - .addSection("Rail", rail -> addRail(rail, sections)) - .addSection("Main", main -> addMain(main, sections))); - flow.build(); - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - private void addHeader(PageFlowBuilder flow, CvDocument doc, - double width) { - flow.addSection("CvV2CompactMonoHeader", section -> { - section.spacing(4) - .padding(new DocumentInsets(13, 16, 14, 16)) - .fillColor(HEADER) - .cornerRadius(3); - section.addSection("Name", name -> - Headline.uppercaseLeftAligned(name, - doc.identity().name(), theme, - headerNameStyle())); - section.addSection("Contact", contact -> - ContactLine.leftAligned(contact, doc.identity(), theme, - headerMetaStyle(), headerLinkStyle(), - headerSeparatorStyle())); - section.addLine(line -> line - .name("CvV2CompactMonoHeaderWidthRule") - .horizontal(Math.max(0, width - 32)) - .color(HEADER) - .thickness(0.1) - .margin(DocumentInsets.zero())); - }); - } + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + List sections = doc.sectionsIn(Slot.MAIN); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CvV2CompactMonoRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .fillColor(PAPER); + + addHeader(flow, doc, document.canvas().innerWidth()); + flow.addRow("CvV2CompactMonoBody", row -> row + .spacing(14) + .weights(0.78, 1.62) + .addSection("Rail", rail -> addRail(rail, sections)) + .addSection("Main", main -> addMain(main, sections))); + flow.build(); + } - private void addRail(SectionBuilder rail, List sections) { - rail.spacing(8) - .padding(new DocumentInsets(11, 11, 13, 11)) - .fillColor(theme.palette().banner()) - .accentLeft(ACCENT, 3.0); - addRailSkills(rail, SectionLookup.firstMatching(sections, SKILL_KEYS)); - addRailEducation(rail, SectionLookup.firstMatching(sections, EDUCATION_KEYS)); - addRailAdditional(rail, SectionLookup.firstMatching(sections, ADDITIONAL_KEYS)); - } + private void addHeader(PageFlowBuilder flow, CvDocument doc, + double width) { + flow.addSection("CvV2CompactMonoHeader", section -> { + section.spacing(4) + .padding(new DocumentInsets(13, 16, 14, 16)) + .fillColor(HEADER) + .cornerRadius(3); + section.addSection("Name", name -> + Headline.uppercaseLeftAligned(name, + doc.identity().name(), theme, + headerNameStyle())); + section.addSection("Contact", contact -> + ContactLine.leftAligned(contact, doc.identity(), theme, + headerMetaStyle(), headerLinkStyle(), + headerSeparatorStyle())); + section.addLine(line -> line + .name("CvV2CompactMonoHeaderWidthRule") + .horizontal(Math.max(0, width - 32)) + .color(HEADER) + .thickness(0.1) + .margin(DocumentInsets.zero())); + }); + } - private void addMain(SectionBuilder main, List sections) { - main.spacing(8); - addProfile(main, SectionLookup.firstMatching(sections, SUMMARY_KEYS)); - addExperience(main, SectionLookup.firstMatching(sections, EXPERIENCE_KEYS)); - addProjects(main, SectionLookup.firstMatching(sections, PROJECT_KEYS)); - } + private void addRail(SectionBuilder rail, List sections) { + rail.spacing(8) + .padding(new DocumentInsets(11, 11, 13, 11)) + .fillColor(theme.palette().banner()) + .accentLeft(ACCENT, 3.0); + addRailSkills(rail, SectionLookup.firstMatching(sections, SKILL_KEYS)); + addRailEducation(rail, SectionLookup.firstMatching(sections, EDUCATION_KEYS)); + addRailAdditional(rail, SectionLookup.firstMatching(sections, ADDITIONAL_KEYS)); + } - private void addRailSkills(SectionBuilder parent, CvSection section) { - if (!(section instanceof SkillsSection skills) - || skills.groups().isEmpty()) { - return; + private void addMain(SectionBuilder main, List sections) { + main.spacing(8); + addProfile(main, SectionLookup.firstMatching(sections, SUMMARY_KEYS)); + addExperience(main, SectionLookup.firstMatching(sections, EXPERIENCE_KEYS)); + addProjects(main, SectionLookup.firstMatching(sections, PROJECT_KEYS)); } - SectionModule.tick(parent, "CvV2CompactMonoSkills", "Skills", - theme, ACCENT, 22, moduleLabelStyle(), host -> { - for (SkillGroup group : skills.groups()) { - addSkillLine(host, group); + private void addRailSkills(SectionBuilder parent, CvSection section) { + if (!(section instanceof SkillsSection skills) + || skills.groups().isEmpty()) { + return; } - }); - } - private void addRailEducation(SectionBuilder parent, CvSection section) { - if (!(section instanceof EntriesSection education) - || education.entries().isEmpty()) { - return; + SectionModule.tick(parent, "CvV2CompactMonoSkills", "Skills", + theme, ACCENT, 22, moduleLabelStyle(), host -> { + for (SkillGroup group : skills.groups()) { + addSkillLine(host, group); + } + }); } - SectionModule.tick(parent, "CvV2CompactMonoEducation", "Education", - theme, ACCENT, 22, moduleLabelStyle(), host -> { - for (CvEntry entry : education.entries()) { - EntryCompactRenderer.slashSubtitleDate(host, entry, - bodyBoldStyle(7.25), - bodyStyle(7.15, theme.palette().ink()), - bodyStyle(7.0, theme.palette().muted()), - 1.02, DocumentInsets.bottom(2.0)); + private void addRailEducation(SectionBuilder parent, CvSection section) { + if (!(section instanceof EntriesSection education) + || education.entries().isEmpty()) { + return; } - }); - } - private void addRailAdditional(SectionBuilder parent, CvSection section) { - if (!(section instanceof RowsSection rows) || rows.rows().isEmpty()) { - return; + SectionModule.tick(parent, "CvV2CompactMonoEducation", "Education", + theme, ACCENT, 22, moduleLabelStyle(), host -> { + for (CvEntry entry : education.entries()) { + EntryCompactRenderer.slashSubtitleDate(host, entry, + bodyBoldStyle(7.25), + bodyStyle(7.15, theme.palette().ink()), + bodyStyle(7.0, theme.palette().muted()), + 1.02, DocumentInsets.bottom(2.0)); + } + }); } - SectionModule.tick(parent, "CvV2CompactMonoAdditional", "Additional", - theme, ACCENT, 22, moduleLabelStyle(), host -> { - for (CvRow row : rows.rows()) { - addRailLabelValue(host, row.label(), row.body()); + private void addRailAdditional(SectionBuilder parent, CvSection section) { + if (!(section instanceof RowsSection rows) || rows.rows().isEmpty()) { + return; } - }); - } - private void addProfile(SectionBuilder parent, CvSection section) { - if (!(section instanceof ParagraphSection profile) + SectionModule.tick(parent, "CvV2CompactMonoAdditional", "Additional", + theme, ACCENT, 22, moduleLabelStyle(), host -> { + for (CvRow row : rows.rows()) { + addRailLabelValue(host, row.label(), row.body()); + } + }); + } + + private void addProfile(SectionBuilder parent, CvSection section) { + if (!(section instanceof ParagraphSection profile) || profile.body().isBlank()) { - return; + return; + } + addCard(parent, "CvV2CompactMonoProfile", "Profile", card -> + RichParagraphRenderer.render(card, profile.body(), + bodyStyle(8.05, theme.palette().ink()), + 1.18, DocumentInsets.zero())); } - addCard(parent, "CvV2CompactMonoProfile", "Profile", card -> - RichParagraphRenderer.render(card, profile.body(), - bodyStyle(8.05, theme.palette().ink()), - 1.18, DocumentInsets.zero())); - } - private void addExperience(SectionBuilder parent, CvSection section) { - if (!(section instanceof EntriesSection entries) + private void addExperience(SectionBuilder parent, CvSection section) { + if (!(section instanceof EntriesSection entries) || entries.entries().isEmpty()) { - return; - } - addCard(parent, "CvV2CompactMonoExperience", "Experience", card -> { - for (CvEntry entry : entries.entries()) { - addExperienceEntry(card, entry); + return; } - }); - } + addCard(parent, "CvV2CompactMonoExperience", "Experience", card -> { + for (CvEntry entry : entries.entries()) { + addExperienceEntry(card, entry); + } + }); + } - private void addProjects(SectionBuilder parent, CvSection section) { - if (!(section instanceof RowsSection projects) + private void addProjects(SectionBuilder parent, CvSection section) { + if (!(section instanceof RowsSection projects) || projects.rows().isEmpty()) { - return; - } - addCard(parent, "CvV2CompactMonoProjects", "Selected Projects", card -> { - for (CvRow row : projects.rows()) { - addProject(card, row); + return; } - }); - } + addCard(parent, "CvV2CompactMonoProjects", "Selected Projects", card -> { + for (CvRow row : projects.rows()) { + addProject(card, row); + } + }); + } - private void addCard(SectionBuilder parent, String name, String title, - Consumer content) { - CardWidget.render(parent, name, CardWidget.Style.builder() - .spacing(4) - .padding(new DocumentInsets(9, 10, 10, 11)) - .fillColor(CARD_FILL) - .stroke(DocumentStroke.of(theme.palette().rule(), 0.35)) - .cornerRadius(3) - .build(), card -> { - moduleLabel(card, title, 24); - content.accept(card); - }); - } + private void addCard(SectionBuilder parent, String name, String title, + Consumer content) { + CardWidget.render(parent, name, CardWidget.Style.builder() + .spacing(4) + .padding(new DocumentInsets(9, 10, 10, 11)) + .fillColor(CARD_FILL) + .stroke(DocumentStroke.of(theme.palette().rule(), 0.35)) + .cornerRadius(3) + .build(), card -> { + moduleLabel(card, title, 24); + content.accept(card); + }); + } - private void moduleLabel(SectionBuilder host, String title, double tickWidth) { - SectionHeader.tickLabel(host, title, theme, ACCENT, tickWidth, - moduleLabelStyle()); - } + private void moduleLabel(SectionBuilder host, String title, double tickWidth) { + SectionHeader.tickLabel(host, title, theme, ACCENT, tickWidth, + moduleLabelStyle()); + } - private void addRailLabelValue(SectionBuilder host, String label, - String value) { - LabelValueRenderer.render(host, label, value, bodyBoldStyle(7.2), - bodyStyle(7.2, theme.palette().muted()), 1.05, - DocumentInsets.bottom(2.0)); - } + private void addRailLabelValue(SectionBuilder host, String label, + String value) { + LabelValueRenderer.render(host, label, value, bodyBoldStyle(7.2), + bodyStyle(7.2, theme.palette().muted()), 1.05, + DocumentInsets.bottom(2.0)); + } - private void addSkillLine(SectionBuilder host, SkillGroup group) { - SkillLineRenderer.limitedInline(host, group, 4, - bodyBoldStyle(7.55), - bodyStyle(7.45, theme.palette().ink()), - 0.98, DocumentInsets.bottom(2.0), " "); - } + private void addSkillLine(SectionBuilder host, SkillGroup group) { + SkillLineRenderer.limitedInline(host, group, 4, + bodyBoldStyle(7.55), + bodyStyle(7.45, theme.palette().ink()), + 0.98, DocumentInsets.bottom(2.0), " "); + } - private void addExperienceEntry(SectionBuilder host, CvEntry entry) { - EntryCompactRenderer.titleSubtitleDateBody(host, entry, - bodyBoldStyle(8.0), - bodyStyle(8.0, theme.palette().ink()), - bodyStyle(7.75, theme.palette().muted()), - bodyStyle(7.95, theme.palette().ink()), - ", ", " | ", 1.08, - DocumentInsets.bottom(1.2), - DocumentInsets.bottom(theme.spacing().entrySeparation()), - 1.14); - } + private void addExperienceEntry(SectionBuilder host, CvEntry entry) { + EntryCompactRenderer.titleSubtitleDateBody(host, entry, + bodyBoldStyle(8.0), + bodyStyle(8.0, theme.palette().ink()), + bodyStyle(7.75, theme.palette().muted()), + bodyStyle(7.95, theme.palette().ink()), + ", ", " | ", 1.08, + DocumentInsets.bottom(1.2), + DocumentInsets.bottom(theme.spacing().entrySeparation()), + 1.14); + } - private void addProject(SectionBuilder host, CvRow row) { - ProjectRenderer.inline(host, row, bodyBoldStyle(8.0), - italicStyle(7.75, theme.palette().muted()), - bodyStyle(7.95, theme.palette().ink()), - 1.12, DocumentInsets.bottom(3.0)); - } + private void addProject(SectionBuilder host, CvRow row) { + ProjectRenderer.inline(host, row, bodyBoldStyle(8.0), + italicStyle(7.75, theme.palette().muted()), + bodyStyle(7.95, theme.palette().ink()), + 1.12, DocumentInsets.bottom(3.0)); + } - private DocumentTextStyle headerNameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, - DocumentColor.rgb(255, 255, 255)); - } + private DocumentTextStyle headerNameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, + DocumentColor.rgb(255, 255, 255)); + } - private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - HEADER_SOFT); - } + private DocumentTextStyle headerMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + HEADER_SOFT); + } - private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - LINK_CYAN); - } + private DocumentTextStyle headerLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + LINK_CYAN); + } - private DocumentTextStyle headerSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - SEPARATOR_GRAY); - } + private DocumentTextStyle headerSeparatorStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + SEPARATOR_GRAY); + } - private DocumentTextStyle moduleLabelStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - ACCENT); - } + private DocumentTextStyle moduleLabelStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + ACCENT); + } - private DocumentTextStyle bodyStyle(double size, DocumentColor color) { - return CvTextStyles.of(theme.typography().bodyFont(), size, - DocumentTextDecoration.DEFAULT, color); - } + private DocumentTextStyle bodyStyle(double size, DocumentColor color) { + return CvTextStyles.of(theme.typography().bodyFont(), size, + DocumentTextDecoration.DEFAULT, color); + } - private DocumentTextStyle bodyBoldStyle(double size) { - return CvTextStyles.of(theme.typography().bodyFont(), size, - DocumentTextDecoration.BOLD, theme.palette().ink()); - } + private DocumentTextStyle bodyBoldStyle(double size) { + return CvTextStyles.of(theme.typography().bodyFont(), size, + DocumentTextDecoration.BOLD, theme.palette().ink()); + } - private DocumentTextStyle italicStyle(double size, DocumentColor color) { - return CvTextStyles.of(theme.typography().bodyFont(), size, - DocumentTextDecoration.ITALIC, color); + private DocumentTextStyle italicStyle(double size, DocumentColor color) { + return CvTextStyles.of(theme.typography().bodyFont(), size, + DocumentTextDecoration.ITALIC, color); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java index 8233050bc..82c5b08f3 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java @@ -9,23 +9,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.EntryCompactRenderer; -import com.demcha.compose.document.templates.cv.v2.components.LabelValueRenderer; -import com.demcha.compose.document.templates.cv.v2.components.ProjectRenderer; -import com.demcha.compose.document.templates.cv.v2.components.RichParagraphRenderer; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.SkillTableRenderer; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.components.*; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.FlowSectionHeader; import com.demcha.compose.document.templates.cv.v2.widgets.Masthead; @@ -57,13 +42,19 @@ */ public final class EditorialBlue { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "editorial-blue"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Editorial Blue"; - /** Recommended page margin (in points). */ + /** + * Recommended page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 28.0; private static final DocumentColor NAME_COLOR = @@ -93,251 +84,245 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - PageFlowBuilder pageFlow = document.dsl() - .pageFlow() - .name("CvV2EditorialBlueRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - pageFlow.addSection("CvV2EditorialBlueHeader", section -> - Masthead.centered(section, doc.identity(), theme, - mastheadStyle())); - - List sections = doc.sectionsIn(Slot.MAIN).stream() - .filter(SectionLookup::hasContent) - .toList(); - for (int i = 0; i < sections.size(); i++) { - CvSection section = sections.get(i); - String name = "CvV2EditorialBlue_" + i; - FlowSectionHeader.label(pageFlow, name + "_Title", - displayTitle(section.title()), width, theme, - sectionTitleStyle(), new DocumentInsets(8, 0, 0, 0), - new DocumentInsets(7, 0, 5, 0), - DocumentInsets.zero(), true); - pageFlow.addSection(name + "_Body", - host -> renderSectionBody(host, section, width)); + @Override + public String displayName() { + return DISPLAY_NAME; } - addFooter(pageFlow, width); - pageFlow.build(); - } + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + PageFlowBuilder pageFlow = document.dsl() + .pageFlow() + .name("CvV2EditorialBlueRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + pageFlow.addSection("CvV2EditorialBlueHeader", section -> + Masthead.centered(section, doc.identity(), theme, + mastheadStyle())); + + List sections = doc.sectionsIn(Slot.MAIN).stream() + .filter(SectionLookup::hasContent) + .toList(); + for (int i = 0; i < sections.size(); i++) { + CvSection section = sections.get(i); + String name = "CvV2EditorialBlue_" + i; + FlowSectionHeader.label(pageFlow, name + "_Title", + displayTitle(section.title()), width, theme, + sectionTitleStyle(), new DocumentInsets(8, 0, 0, 0), + new DocumentInsets(7, 0, 5, 0), + DocumentInsets.zero(), true); + pageFlow.addSection(name + "_Body", + host -> renderSectionBody(host, section, width)); + } - private void renderSectionBody(SectionBuilder section, CvSection cvSection, - double width) { - section.spacing(theme.spacing().sectionBodySpacing()) - .padding(theme.spacing().sectionBodyPadding()); - - if (cvSection instanceof ParagraphSection paragraph) { - renderParagraph(section, paragraph.body(), 1.6); - } else if (cvSection instanceof SkillsSection skills) { - renderSkills(section, skills.groups(), width); - } else if (cvSection instanceof EntriesSection entries) { - renderEntries(section, entries); - } else if (cvSection instanceof RowsSection rows) { - renderRows(section, rows); + addFooter(pageFlow, width); + pageFlow.build(); } - } - private void renderEntries(SectionBuilder section, EntriesSection entries) { - String normalized = SectionLookup.normalize(entries.title()); - boolean education = normalized.contains("education") - || normalized.contains("certification"); - for (int i = 0; i < entries.entries().size(); i++) { - if (i > 0) { - section.spacer(0, theme.spacing().entrySeparation()); - } - if (education) { - renderEducationEntry(section, entries.entries().get(i)); - } else { - renderExperienceEntry(section, entries.entries().get(i)); + private void renderSectionBody(SectionBuilder section, CvSection cvSection, + double width) { + section.spacing(theme.spacing().sectionBodySpacing()) + .padding(theme.spacing().sectionBodyPadding()); + + if (cvSection instanceof ParagraphSection paragraph) { + renderParagraph(section, paragraph.body(), 1.6); + } else if (cvSection instanceof SkillsSection skills) { + renderSkills(section, skills.groups(), width); + } else if (cvSection instanceof EntriesSection entries) { + renderEntries(section, entries); + } else if (cvSection instanceof RowsSection rows) { + renderRows(section, rows); } } - } - - private void renderExperienceEntry(SectionBuilder section, CvEntry entry) { - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - 11.0, DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle dateStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - 11.0, DocumentTextDecoration.BOLD, theme.palette().rule()); - DocumentTextStyle subtitleStyle = CvTextStyles.of(FontName.HELVETICA, - 9.4, DocumentTextDecoration.ITALIC, theme.palette().ink()); - - EntryCompactRenderer.titleDateBody(section, entry, titleStyle, - dateStyle, subtitleStyle, theme.bodyStyle(), " ", - 1.0, DocumentInsets.top(1), DocumentInsets.zero(), - DocumentInsets.top(1), 1.5, false); - } - - private void renderEducationEntry(SectionBuilder section, CvEntry entry) { - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - 10.6, DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle dateStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - 10.0, DocumentTextDecoration.BOLD, theme.palette().rule()); - DocumentTextStyle subtitleStyle = CvTextStyles.of(FontName.HELVETICA, - 9.2, DocumentTextDecoration.ITALIC, theme.palette().ink()); - - EntryCompactRenderer.titleDateBody(section, entry, titleStyle, - dateStyle, subtitleStyle, theme.bodyStyle(), " ", - 1.0, DocumentInsets.top(1), DocumentInsets.zero(), - DocumentInsets.top(1), 1.4, false); - } - private void renderRows(SectionBuilder section, RowsSection rows) { - if (SectionLookup.titleContains(rows.title(), "project")) { - for (int i = 0; i < rows.rows().size(); i++) { + private void renderEntries(SectionBuilder section, EntriesSection entries) { + String normalized = SectionLookup.normalize(entries.title()); + boolean education = normalized.contains("education") + || normalized.contains("certification"); + for (int i = 0; i < entries.entries().size(); i++) { if (i > 0) { section.spacer(0, theme.spacing().entrySeparation()); } - renderProject(section, rows.rows().get(i)); + if (education) { + renderEducationEntry(section, entries.entries().get(i)); + } else { + renderExperienceEntry(section, entries.entries().get(i)); + } } - return; } - for (CvRow row : rows.rows()) { - renderKeyValue(section, row); + private void renderExperienceEntry(SectionBuilder section, CvEntry entry) { + DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + 11.0, DocumentTextDecoration.BOLD, NAME_COLOR); + DocumentTextStyle dateStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + 11.0, DocumentTextDecoration.BOLD, theme.palette().rule()); + DocumentTextStyle subtitleStyle = CvTextStyles.of(FontName.HELVETICA, + 9.4, DocumentTextDecoration.ITALIC, theme.palette().ink()); + + EntryCompactRenderer.titleDateBody(section, entry, titleStyle, + dateStyle, subtitleStyle, theme.bodyStyle(), " ", + 1.0, DocumentInsets.top(1), DocumentInsets.zero(), + DocumentInsets.top(1), 1.5, false); } - } - private void renderProject(SectionBuilder section, CvRow row) { - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - 10.6, DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle stackStyle = CvTextStyles.of(FontName.HELVETICA, - 9.3, DocumentTextDecoration.ITALIC, theme.palette().rule()); - ProjectRenderer.titleThenBody(section, row, titleStyle, stackStyle, - theme.bodyStyle(), 1.45, DocumentInsets.top(1), - DocumentInsets.top(1)); - } + private void renderEducationEntry(SectionBuilder section, CvEntry entry) { + DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + 10.6, DocumentTextDecoration.BOLD, NAME_COLOR); + DocumentTextStyle dateStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + 10.0, DocumentTextDecoration.BOLD, theme.palette().rule()); + DocumentTextStyle subtitleStyle = CvTextStyles.of(FontName.HELVETICA, + 9.2, DocumentTextDecoration.ITALIC, theme.palette().ink()); + + EntryCompactRenderer.titleDateBody(section, entry, titleStyle, + dateStyle, subtitleStyle, theme.bodyStyle(), " ", + 1.0, DocumentInsets.top(1), DocumentInsets.zero(), + DocumentInsets.top(1), 1.4, false); + } - private void renderKeyValue(SectionBuilder section, CvRow row) { - DocumentTextStyle keyStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - theme.typography().sizeBody(), - DocumentTextDecoration.BOLD, NAME_COLOR); - LabelValueRenderer.render(section, row.label(), row.body(), - keyStyle, theme.bodyStyle(), 1.4, DocumentInsets.top(1)); - } + private void renderRows(SectionBuilder section, RowsSection rows) { + if (SectionLookup.titleContains(rows.title(), "project")) { + for (int i = 0; i < rows.rows().size(); i++) { + if (i > 0) { + section.spacer(0, theme.spacing().entrySeparation()); + } + renderProject(section, rows.rows().get(i)); + } + return; + } - private void renderParagraph(SectionBuilder section, String text, - double lineSpacing) { - String value = text == null ? "" : text.trim(); - if (value.isBlank()) { - return; + for (CvRow row : rows.rows()) { + renderKeyValue(section, row); + } } - RichParagraphRenderer.render(section, value, theme.bodyStyle(), - lineSpacing, DocumentInsets.top(1)); - } - private void renderSkills(SectionBuilder section, List groups, - double width) { - if (groups.isEmpty()) { - return; + private void renderProject(SectionBuilder section, CvRow row) { + DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + 10.6, DocumentTextDecoration.BOLD, NAME_COLOR); + DocumentTextStyle stackStyle = CvTextStyles.of(FontName.HELVETICA, + 9.3, DocumentTextDecoration.ITALIC, theme.palette().rule()); + ProjectRenderer.titleThenBody(section, row, titleStyle, stackStyle, + theme.bodyStyle(), 1.45, DocumentInsets.top(1), + DocumentInsets.top(1)); } - DocumentTextStyle cellStyle = CvTextStyles.of(FontName.HELVETICA, - 8.6, DocumentTextDecoration.DEFAULT, theme.palette().ink()); - TableWidget.Style tableStyle = TableWidget.Style.builder() - .name("CvV2EditorialBlueSkillsTable") - .columns(SKILL_COLUMNS) - .cellPadding(new DocumentInsets(4, 6, 4, 6)) - .border(theme.palette().banner(), 0.5) - .textStyle(cellStyle) - .widthAdjustment(1.0) - .build(); - - SkillTableRenderer.grid(section, groups, width, tableStyle, "• "); - } - private void addFooter(PageFlowBuilder pageFlow, double width) { - pageFlow.addLine(line -> line - .name("CvV2EditorialBlueFooterRule") - .horizontal(width) - .color(theme.palette().banner()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(new DocumentInsets(6, 0, 0, 0))); - pageFlow.addSection("CvV2EditorialBlueFooter", section -> section - .padding(new DocumentInsets(2, 0, 0, 0)) - .addParagraph(paragraph -> paragraph - .text("References available upon request.") - .textStyle(CvTextStyles.of(FontName.HELVETICA, - 8.4, DocumentTextDecoration.ITALIC, - theme.palette().muted())) - .align(TextAlign.CENTER) - .margin(DocumentInsets.top(2)))); - } + private void renderKeyValue(SectionBuilder section, CvRow row) { + DocumentTextStyle keyStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + theme.typography().sizeBody(), + DocumentTextDecoration.BOLD, NAME_COLOR); + LabelValueRenderer.render(section, row.label(), row.body(), + keyStyle, theme.bodyStyle(), 1.4, DocumentInsets.top(1)); + } - private String displayTitle(String title) { - String normalized = SectionLookup.normalize(title); - if (normalized.contains("summary") || normalized.contains("profile")) { - return "PROFESSIONAL PROFILE"; + private void renderParagraph(SectionBuilder section, String text, + double lineSpacing) { + String value = text == null ? "" : text.trim(); + if (value.isBlank()) { + return; + } + RichParagraphRenderer.render(section, value, theme.bodyStyle(), + lineSpacing, DocumentInsets.top(1)); } - if (normalized.contains("experience") - || normalized.contains("employment")) { - return "EMPLOYMENT HISTORY"; + + private void renderSkills(SectionBuilder section, List groups, + double width) { + if (groups.isEmpty()) { + return; + } + DocumentTextStyle cellStyle = CvTextStyles.of(FontName.HELVETICA, + 8.6, DocumentTextDecoration.DEFAULT, theme.palette().ink()); + TableWidget.Style tableStyle = TableWidget.Style.builder() + .name("CvV2EditorialBlueSkillsTable") + .columns(SKILL_COLUMNS) + .cellPadding(new DocumentInsets(4, 6, 4, 6)) + .border(theme.palette().banner(), 0.5) + .textStyle(cellStyle) + .widthAdjustment(1.0) + .build(); + + SkillTableRenderer.grid(section, groups, width, tableStyle, "• "); } - if (normalized.contains("project")) { - return "PROJECTS"; + + private void addFooter(PageFlowBuilder pageFlow, double width) { + pageFlow.addLine(line -> line + .name("CvV2EditorialBlueFooterRule") + .horizontal(width) + .color(theme.palette().banner()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(new DocumentInsets(6, 0, 0, 0))); + pageFlow.addSection("CvV2EditorialBlueFooter", section -> section + .padding(new DocumentInsets(2, 0, 0, 0)) + .addParagraph(paragraph -> paragraph + .text("References available upon request.") + .textStyle(CvTextStyles.of(FontName.HELVETICA, + 8.4, DocumentTextDecoration.ITALIC, + theme.palette().muted())) + .align(TextAlign.CENTER) + .margin(DocumentInsets.top(2)))); } - if (normalized.contains("education") + + private String displayTitle(String title) { + String normalized = SectionLookup.normalize(title); + if (normalized.contains("summary") || normalized.contains("profile")) { + return "PROFESSIONAL PROFILE"; + } + if (normalized.contains("experience") + || normalized.contains("employment")) { + return "EMPLOYMENT HISTORY"; + } + if (normalized.contains("project")) { + return "PROJECTS"; + } + if (normalized.contains("education") || normalized.contains("certification")) { - return "EDUCATION"; - } - if (normalized.contains("skill")) { - return "KEY SKILLS"; + return "EDUCATION"; + } + if (normalized.contains("skill")) { + return "KEY SKILLS"; + } + if (normalized.contains("additional")) { + return "ADDITIONAL"; + } + return title.toUpperCase(Locale.ROOT); } - if (normalized.contains("additional")) { - return "ADDITIONAL"; + + private DocumentTextStyle sectionTitleStyle() { + return CvTextStyles.of(FontName.HELVETICA_BOLD, + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + theme.palette().rule()); } - return title.toUpperCase(Locale.ROOT); - } - private DocumentTextStyle sectionTitleStyle() { - return CvTextStyles.of(FontName.HELVETICA_BOLD, - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - theme.palette().rule()); - } + private Masthead.Style mastheadStyle() { + DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, NAME_COLOR); + DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA, + 10.0, DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + DocumentTextStyle linkStyle = CvTextStyles.of(FontName.HELVETICA, + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + theme.palette().rule()); + return Masthead.Style.builder() + .nameStyle(nameStyle) + .titleStyle(titleStyle) + .metaStyle(theme.contactStyle()) + .linkStyle(linkStyle) + .separatorStyle(theme.contactStyle()) + .lineMargin(DocumentInsets.top(1)) + .build(); + } - private Masthead.Style mastheadStyle() { - DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA, - 10.0, DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - DocumentTextStyle linkStyle = CvTextStyles.of(FontName.HELVETICA, - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - theme.palette().rule()); - return Masthead.Style.builder() - .nameStyle(nameStyle) - .titleStyle(titleStyle) - .metaStyle(theme.contactStyle()) - .linkStyle(linkStyle) - .separatorStyle(theme.contactStyle()) - .lineMargin(DocumentInsets.top(1)) - .build(); } - - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java index 8722814a7..28e3ab95e 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java @@ -5,31 +5,16 @@ import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.ProjectLabel; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvLink; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; +import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -58,48 +43,72 @@ */ public final class EngineeringResume { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "engineering-resume"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Engineering Resume"; - /** Recommended page margin (in points) — matches V1 TechLead. */ + /** + * Recommended page margin (in points) — matches V1 TechLead. + */ public static final double RECOMMENDED_MARGIN = 20.0; - /** V1 TechLead deep navy used for the command header + rail fill. */ + /** + * V1 TechLead deep navy used for the command header + rail fill. + */ private static final DocumentColor NAVY = DocumentColor.rgb(13, 32, 47); - /** V1 TechLead lighter navy used for inside-rail rule lines. */ + /** + * V1 TechLead lighter navy used for inside-rail rule lines. + */ private static final DocumentColor NAVY_SOFT = DocumentColor.rgb(35, 56, 72); - /** V1 TechLead green accent for headings, strips and link colour. */ + /** + * V1 TechLead green accent for headings, strips and link colour. + */ private static final DocumentColor GREEN = DocumentColor.rgb(27, 145, 104); - /** Body text colour for items rendered inside the navy rail. */ + /** + * Body text colour for items rendered inside the navy rail. + */ private static final DocumentColor RAIL_TEXT = DocumentColor.rgb(220, 231, 236); - /** Secondary text colour (e.g. dates) inside the navy rail. */ + /** + * Secondary text colour (e.g. dates) inside the navy rail. + */ private static final DocumentColor RAIL_DATE = DocumentColor.rgb(182, 201, 210); - /** Subtitle colour used under the masthead name. */ + /** + * Subtitle colour used under the masthead name. + */ private static final DocumentColor SUBTITLE_COLOR = DocumentColor.rgb(190, 209, 219); - /** Contact metadata colour (right-aligned over the navy header). */ + /** + * Contact metadata colour (right-aligned over the navy header). + */ private static final DocumentColor CONTACT_META = DocumentColor.rgb(196, 211, 220); - /** Contact-link colour (cyan-green underlined over the navy header). */ + /** + * Contact-link colour (cyan-green underlined over the navy header). + */ private static final DocumentColor CONTACT_LINK = DocumentColor.rgb(78, 207, 161); - /** Fallback masthead subtitle when {@code identity.jobTitle()} is blank. */ + /** + * Fallback masthead subtitle when {@code identity.jobTitle()} is blank. + */ private static final String SUBTITLE_FALLBACK = "SECURE BACKEND SYSTEMS / DELIVERY LEADERSHIP"; @@ -139,536 +148,530 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); + public String id() { + return ID; + } - List sections = doc.sectionsIn(Slot.MAIN); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CvV2EngineeringResumeRoot") - .spacing(theme.spacing().pageFlowSpacing()); + @Override + public String displayName() { + return DISPLAY_NAME; + } - addHeader(flow, doc.identity()); - addBody(flow, sections); + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); - flow.build(); - } + List sections = doc.sectionsIn(Slot.MAIN); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CvV2EngineeringResumeRoot") + .spacing(theme.spacing().pageFlowSpacing()); - // -- Header -------------------------------------------------------- - - private void addHeader(PageFlowBuilder flow, CvIdentity identity) { - flow.addSection("CvV2EngineeringResumeHeader", section -> section - .spacing(5) - .padding(new DocumentInsets(13, 15, 13, 15)) - .fillColor(NAVY) - .cornerRadius(DocumentCornerRadius.top( - theme.spacing().bannerCornerRadius())) - .accentBottom(GREEN, theme.spacing().accentRuleWidth()) - .addRow("CvV2EngineeringResumeHeaderRow", row -> row - .spacing(12) - .weights(1.15, 0.85) - .addSection("CvV2EngineeringResumeIdentity", - identityBlock -> addIdentityBlock( - identityBlock, identity)) - .addSection("CvV2EngineeringResumeContact", - contact -> addContactStack(contact, - identity)))); - } + addHeader(flow, doc.identity()); + addBody(flow, sections); - private void addIdentityBlock(SectionBuilder block, CvIdentity identity) { - block.padding(DocumentInsets.zero()) - .spacing(3) - .addParagraph(paragraph -> paragraph - .text(identity.name().full() - .toUpperCase(Locale.ROOT)) - .textStyle(nameStyle()) - .autoSize(theme.typography().sizeHeadline(), 19.0) - .margin(DocumentInsets.zero())) - .addParagraph(paragraph -> paragraph - .text(headerSubtitleText(identity)) - .textStyle(subtitleStyle()) - .margin(DocumentInsets.zero())); - } + flow.build(); + } - private void addContactStack(SectionBuilder section, CvIdentity identity) { - section.spacing(2).padding(DocumentInsets.zero()); - DocumentTextStyle meta = contactMetaStyle(); - DocumentTextStyle link = contactLinkStyle(); - for (ContactPart part : contactParts(identity)) { - section.addParagraph(paragraph -> paragraph - .text(part.text()) - .textStyle(part.linkOptions() == null ? meta : link) - .link(part.linkOptions()) - .align(TextAlign.RIGHT) - .margin(DocumentInsets.zero())); + // -- Header -------------------------------------------------------- + + private void addHeader(PageFlowBuilder flow, CvIdentity identity) { + flow.addSection("CvV2EngineeringResumeHeader", section -> section + .spacing(5) + .padding(new DocumentInsets(13, 15, 13, 15)) + .fillColor(NAVY) + .cornerRadius(DocumentCornerRadius.top( + theme.spacing().bannerCornerRadius())) + .accentBottom(GREEN, theme.spacing().accentRuleWidth()) + .addRow("CvV2EngineeringResumeHeaderRow", row -> row + .spacing(12) + .weights(1.15, 0.85) + .addSection("CvV2EngineeringResumeIdentity", + identityBlock -> addIdentityBlock( + identityBlock, identity)) + .addSection("CvV2EngineeringResumeContact", + contact -> addContactStack(contact, + identity)))); } - } - private static List contactParts(CvIdentity identity) { - if (identity == null) { - return List.of(); + private void addIdentityBlock(SectionBuilder block, CvIdentity identity) { + block.padding(DocumentInsets.zero()) + .spacing(3) + .addParagraph(paragraph -> paragraph + .text(identity.name().full() + .toUpperCase(Locale.ROOT)) + .textStyle(nameStyle()) + .autoSize(theme.typography().sizeHeadline(), 19.0) + .margin(DocumentInsets.zero())) + .addParagraph(paragraph -> paragraph + .text(headerSubtitleText(identity)) + .textStyle(subtitleStyle()) + .margin(DocumentInsets.zero())); } - java.util.List parts = new java.util.ArrayList<>(); - addPart(parts, identity.contact().address(), null); - addPart(parts, identity.contact().phone(), null); - String email = identity.contact().email(); - if (!email.isBlank()) { - addPart(parts, email, - new DocumentLinkOptions("mailto:" + email)); + + private void addContactStack(SectionBuilder section, CvIdentity identity) { + section.spacing(2).padding(DocumentInsets.zero()); + DocumentTextStyle meta = contactMetaStyle(); + DocumentTextStyle link = contactLinkStyle(); + for (ContactPart part : contactParts(identity)) { + section.addParagraph(paragraph -> paragraph + .text(part.text()) + .textStyle(part.linkOptions() == null ? meta : link) + .link(part.linkOptions()) + .align(TextAlign.RIGHT) + .margin(DocumentInsets.zero())); + } } - for (CvLink link : identity.links()) { - addPart(parts, link.label(), link.url().isBlank() - ? null - : new DocumentLinkOptions(link.url().trim())); + + private static List contactParts(CvIdentity identity) { + if (identity == null) { + return List.of(); + } + List parts = new ArrayList<>(); + addPart(parts, identity.contact().address(), null); + addPart(parts, identity.contact().phone(), null); + String email = identity.contact().email(); + if (!email.isBlank()) { + addPart(parts, email, + new DocumentLinkOptions("mailto:" + email)); + } + for (CvLink link : identity.links()) { + addPart(parts, link.label(), link.url().isBlank() + ? null + : new DocumentLinkOptions(link.url().trim())); + } + return List.copyOf(parts); } - return List.copyOf(parts); - } - private static void addPart(java.util.List parts, - String text, - DocumentLinkOptions linkOptions) { - if (text != null && !text.isBlank()) { - parts.add(new ContactPart(text.trim(), linkOptions)); + private static void addPart(List parts, + String text, + DocumentLinkOptions linkOptions) { + if (text != null && !text.isBlank()) { + parts.add(new ContactPart(text.trim(), linkOptions)); + } } - } - private static String headerSubtitleText(CvIdentity identity) { - if (identity == null) { - return SUBTITLE_FALLBACK; + private static String headerSubtitleText(CvIdentity identity) { + if (identity == null) { + return SUBTITLE_FALLBACK; + } + String jobTitle = identity.jobTitle(); + if (jobTitle == null || jobTitle.isBlank()) { + return SUBTITLE_FALLBACK; + } + return MarkdownInline.plainText(jobTitle) + .toUpperCase(Locale.ROOT); } - String jobTitle = identity.jobTitle(); - if (jobTitle == null || jobTitle.isBlank()) { - return SUBTITLE_FALLBACK; + + // -- Body 2-column ------------------------------------------------- + + private void addBody(PageFlowBuilder flow, List sections) { + CvSection skills = SectionLookup.firstMatching(sections, SKILL_KEYS); + CvSection education = SectionLookup.firstMatching(sections, + EDUCATION_KEYS); + CvSection additional = SectionLookup.firstMatching(sections, + ADDITIONAL_KEYS); + CvSection summary = SectionLookup.firstMatching(sections, + SUMMARY_KEYS); + CvSection experience = SectionLookup.firstMatching(sections, + EXPERIENCE_KEYS); + CvSection projects = SectionLookup.firstMatching(sections, + PROJECT_KEYS); + + flow.addRow("CvV2EngineeringResumeBody", row -> row + .spacing(14) + .weights(0.76, 1.64) + .addSection("CvV2EngineeringResumeRail", rail -> { + rail.spacing(8) + .padding(new DocumentInsets(10, 10, 11, 10)) + .fillColor(NAVY) + .cornerRadius(DocumentCornerRadius.bottom( + theme.spacing().bannerCornerRadius())) + .accentTop(GREEN, 2.0); + addRailSkills(rail, skills); + addRailEducation(rail, education); + addRailAdditional(rail, additional); + }) + .addSection("CvV2EngineeringResumeMain", main -> { + main.spacing(8); + addProfile(main, summary); + addExperience(main, experience); + addProjects(main, projects); + })); } - return MarkdownInline.plainText(jobTitle) - .toUpperCase(Locale.ROOT); - } - // -- Body 2-column ------------------------------------------------- - - private void addBody(PageFlowBuilder flow, List sections) { - CvSection skills = SectionLookup.firstMatching(sections, SKILL_KEYS); - CvSection education = SectionLookup.firstMatching(sections, - EDUCATION_KEYS); - CvSection additional = SectionLookup.firstMatching(sections, - ADDITIONAL_KEYS); - CvSection summary = SectionLookup.firstMatching(sections, - SUMMARY_KEYS); - CvSection experience = SectionLookup.firstMatching(sections, - EXPERIENCE_KEYS); - CvSection projects = SectionLookup.firstMatching(sections, - PROJECT_KEYS); - - flow.addRow("CvV2EngineeringResumeBody", row -> row - .spacing(14) - .weights(0.76, 1.64) - .addSection("CvV2EngineeringResumeRail", rail -> { - rail.spacing(8) - .padding(new DocumentInsets(10, 10, 11, 10)) - .fillColor(NAVY) - .cornerRadius(DocumentCornerRadius.bottom( - theme.spacing().bannerCornerRadius())) - .accentTop(GREEN, 2.0); - addRailSkills(rail, skills); - addRailEducation(rail, education); - addRailAdditional(rail, additional); - }) - .addSection("CvV2EngineeringResumeMain", main -> { - main.spacing(8); - addProfile(main, summary); - addExperience(main, experience); - addProjects(main, projects); - })); - } + // -- Rail modules --------------------------------------------------- - // -- Rail modules --------------------------------------------------- - - private void addRailSkills(SectionBuilder parent, CvSection section) { - if (!hasContent(section) || !(section instanceof SkillsSection skills)) { - return; - } - parent.addSection("CvV2EngineeringResumeSkills", block -> { - addRailHeading(block, "Core Stack"); - List groups = skills.groups(); - for (int i = 0; i < Math.min(groups.size(), 7); i++) { - SkillGroup group = groups.get(i); - block.addParagraph(paragraph -> paragraph - .textStyle(railBodyStyle()) - .lineSpacing(1.0) - .margin(DocumentInsets.bottom(1.8)) - .rich(rich -> { - String category = group.category(); - if (!category.isBlank()) { - rich.style(category + ":", - railLabelStyle()); - rich.style(" " - + compactValues( - group.skillsInline(), 5), - railBodyStyle()); - } else { - rich.style( - compactValues(group.skillsInline(), - 6), - railBodyStyle()); - } - })); + private void addRailSkills(SectionBuilder parent, CvSection section) { + if (!hasContent(section) || !(section instanceof SkillsSection skills)) { + return; } - }); - } + parent.addSection("CvV2EngineeringResumeSkills", block -> { + addRailHeading(block, "Core Stack"); + List groups = skills.groups(); + for (int i = 0; i < Math.min(groups.size(), 7); i++) { + SkillGroup group = groups.get(i); + block.addParagraph(paragraph -> paragraph + .textStyle(railBodyStyle()) + .lineSpacing(1.0) + .margin(DocumentInsets.bottom(1.8)) + .rich(rich -> { + String category = group.category(); + if (!category.isBlank()) { + rich.style(category + ":", + railLabelStyle()); + rich.style(" " + + compactValues( + group.skillsInline(), 5), + railBodyStyle()); + } else { + rich.style( + compactValues(group.skillsInline(), + 6), + railBodyStyle()); + } + })); + } + }); + } - private void addRailEducation(SectionBuilder parent, CvSection section) { - if (!hasContent(section) + private void addRailEducation(SectionBuilder parent, CvSection section) { + if (!hasContent(section) || !(section instanceof EntriesSection entries)) { - return; - } - parent.addSection("CvV2EngineeringResumeEducation", block -> { - addRailHeading(block, "Learning"); - List list = entries.entries(); - for (int i = 0; i < Math.min(list.size(), 4); i++) { - CvEntry entry = list.get(i); - block.addParagraph(paragraph -> paragraph - .textStyle(railBodyStyle()) - .lineSpacing(1.0) - .margin(DocumentInsets.bottom(2.3)) - .rich(rich -> { - rich.style(entry.title(), railTitleStyle()); - if (!entry.date().isBlank()) { - rich.style(" / " + entry.date(), - railDateStyle()); - } - })); + return; } - }); - } + parent.addSection("CvV2EngineeringResumeEducation", block -> { + addRailHeading(block, "Learning"); + List list = entries.entries(); + for (int i = 0; i < Math.min(list.size(), 4); i++) { + CvEntry entry = list.get(i); + block.addParagraph(paragraph -> paragraph + .textStyle(railBodyStyle()) + .lineSpacing(1.0) + .margin(DocumentInsets.bottom(2.3)) + .rich(rich -> { + rich.style(entry.title(), railTitleStyle()); + if (!entry.date().isBlank()) { + rich.style(" / " + entry.date(), + railDateStyle()); + } + })); + } + }); + } - private void addRailAdditional(SectionBuilder parent, CvSection section) { - if (!hasContent(section) + private void addRailAdditional(SectionBuilder parent, CvSection section) { + if (!hasContent(section) || !(section instanceof RowsSection rows)) { - return; - } - parent.addSection("CvV2EngineeringResumeAdditional", block -> { - addRailHeading(block, "Details"); - List list = rows.rows(); - for (int i = 0; i < Math.min(list.size(), 2); i++) { - CvRow row = list.get(i); - String text = row.label().isBlank() - ? row.body() - : (row.body().isBlank() - ? row.label() - : row.label() + ": " + row.body()); - String clean = MarkdownInline.plainText(text); - block.addParagraph(paragraph -> paragraph - .text(clean) - .textStyle(railBodyStyle()) - .lineSpacing(1.0) - .margin(DocumentInsets.bottom(1.8))); + return; } - }); - } + parent.addSection("CvV2EngineeringResumeAdditional", block -> { + addRailHeading(block, "Details"); + List list = rows.rows(); + for (int i = 0; i < Math.min(list.size(), 2); i++) { + CvRow row = list.get(i); + String text = row.label().isBlank() + ? row.body() + : (row.body().isBlank() + ? row.label() + : row.label() + ": " + row.body()); + String clean = MarkdownInline.plainText(text); + block.addParagraph(paragraph -> paragraph + .text(clean) + .textStyle(railBodyStyle()) + .lineSpacing(1.0) + .margin(DocumentInsets.bottom(1.8))); + } + }); + } - // -- Main modules --------------------------------------------------- + // -- Main modules --------------------------------------------------- - private void addProfile(SectionBuilder parent, CvSection section) { - if (!hasContent(section) + private void addProfile(SectionBuilder parent, CvSection section) { + if (!hasContent(section) || !(section instanceof ParagraphSection summary)) { - return; - } - parent.addSection("CvV2EngineeringResumeProfile", card -> card - .spacing(4) - .padding(new DocumentInsets(8, 10, 8, 10)) - .fillColor(theme.palette().banner()) - .accentLeft(GREEN, 3.0) - .cornerRadius(DocumentCornerRadius.right( - theme.spacing().bannerCornerRadius())) - .addParagraph(paragraph -> paragraph - .text("ENGINEERING PROFILE") - .textStyle(profileHeadingStyle()) - .margin(DocumentInsets.zero())) - .addParagraph(paragraph -> paragraph - .text(MarkdownInline.plainText(summary.body())) - .textStyle(profileBodyStyle()) - .lineSpacing(1.2) - .margin(DocumentInsets.zero()))); - } + return; + } + parent.addSection("CvV2EngineeringResumeProfile", card -> card + .spacing(4) + .padding(new DocumentInsets(8, 10, 8, 10)) + .fillColor(theme.palette().banner()) + .accentLeft(GREEN, 3.0) + .cornerRadius(DocumentCornerRadius.right( + theme.spacing().bannerCornerRadius())) + .addParagraph(paragraph -> paragraph + .text("ENGINEERING PROFILE") + .textStyle(profileHeadingStyle()) + .margin(DocumentInsets.zero())) + .addParagraph(paragraph -> paragraph + .text(MarkdownInline.plainText(summary.body())) + .textStyle(profileBodyStyle()) + .lineSpacing(1.2) + .margin(DocumentInsets.zero()))); + } - private void addExperience(SectionBuilder parent, CvSection section) { - if (!hasContent(section) + private void addExperience(SectionBuilder parent, CvSection section) { + if (!hasContent(section) || !(section instanceof EntriesSection entries)) { - return; - } - parent.addSection("CvV2EngineeringResumeExperience", block -> { - addMainHeading(block, "Leadership Experience"); - List list = entries.entries(); - for (int i = 0; i < Math.min(list.size(), 2); i++) { - CvEntry entry = list.get(i); - block.addSection("CvV2EngineeringResumeRoleCard", card -> { - card.spacing(3) - .padding(new DocumentInsets(6, 8, 6, 8)) - .fillColor(DocumentColor.WHITE) - .stroke(DocumentStroke.of(theme.palette().rule(), - 0.35)) - .cornerRadius(DocumentCornerRadius.right(3)) - .accentLeft(GREEN, 2.0); - addRoleHeader(card, entry); - if (!entry.subtitle().isBlank()) { - card.addParagraph(paragraph -> paragraph - .text(MarkdownInline.plainText( - entry.subtitle())) - .textStyle(subtitleBodyStyle()) - .margin(DocumentInsets.zero())); - } - if (!entry.body().isBlank()) { - card.addParagraph(paragraph -> paragraph - .text(MarkdownInline.plainText(entry.body())) - .textStyle(roleBodyStyle()) - .lineSpacing(1.08) - .margin(DocumentInsets.zero())); - } - }); + return; } - }); - } + parent.addSection("CvV2EngineeringResumeExperience", block -> { + addMainHeading(block, "Leadership Experience"); + List list = entries.entries(); + for (int i = 0; i < Math.min(list.size(), 2); i++) { + CvEntry entry = list.get(i); + block.addSection("CvV2EngineeringResumeRoleCard", card -> { + card.spacing(3) + .padding(new DocumentInsets(6, 8, 6, 8)) + .fillColor(DocumentColor.WHITE) + .stroke(DocumentStroke.of(theme.palette().rule(), + 0.35)) + .cornerRadius(DocumentCornerRadius.right(3)) + .accentLeft(GREEN, 2.0); + addRoleHeader(card, entry); + if (!entry.subtitle().isBlank()) { + card.addParagraph(paragraph -> paragraph + .text(MarkdownInline.plainText( + entry.subtitle())) + .textStyle(subtitleBodyStyle()) + .margin(DocumentInsets.zero())); + } + if (!entry.body().isBlank()) { + card.addParagraph(paragraph -> paragraph + .text(MarkdownInline.plainText(entry.body())) + .textStyle(roleBodyStyle()) + .lineSpacing(1.08) + .margin(DocumentInsets.zero())); + } + }); + } + }); + } - private void addProjects(SectionBuilder parent, CvSection section) { - if (!hasContent(section) + private void addProjects(SectionBuilder parent, CvSection section) { + if (!hasContent(section) || !(section instanceof RowsSection rows)) { - return; - } - parent.addSection("CvV2EngineeringResumeProjects", block -> { - addMainHeading(block, "Technical Evidence"); - List list = rows.rows(); - for (int i = 0; i < Math.min(list.size(), 4); i++) { - CvRow row = list.get(i); - ProjectLabel label = ProjectLabel.parse(row.label()); - String body = MarkdownInline.plainText(row.body()); - block.addSection("CvV2EngineeringResumeProjectCard", card -> card - .spacing(3) - .padding(new DocumentInsets(5, 8, 5, 8)) - .fillColor(DocumentColor.WHITE) - .stroke(DocumentStroke.of(theme.palette().rule(), 0.3)) - .cornerRadius(3) - .addParagraph(paragraph -> paragraph - .textStyle(projectBodyStyle()) - .lineSpacing(1.06) - .margin(DocumentInsets.zero()) - .rich(rich -> { - rich.style(label.title(), - projectTitleStyle()); - if (!label.stack().isBlank()) { - rich.style(" (" + label.stack() - + ")", - projectContextStyle()); - } - if (!body.isBlank()) { - rich.style(" - " + body, - projectBodyStyle()); - } - }))); + return; } - }); - } + parent.addSection("CvV2EngineeringResumeProjects", block -> { + addMainHeading(block, "Technical Evidence"); + List list = rows.rows(); + for (int i = 0; i < Math.min(list.size(), 4); i++) { + CvRow row = list.get(i); + ProjectLabel label = ProjectLabel.parse(row.label()); + String body = MarkdownInline.plainText(row.body()); + block.addSection("CvV2EngineeringResumeProjectCard", card -> card + .spacing(3) + .padding(new DocumentInsets(5, 8, 5, 8)) + .fillColor(DocumentColor.WHITE) + .stroke(DocumentStroke.of(theme.palette().rule(), 0.3)) + .cornerRadius(3) + .addParagraph(paragraph -> paragraph + .textStyle(projectBodyStyle()) + .lineSpacing(1.06) + .margin(DocumentInsets.zero()) + .rich(rich -> { + rich.style(label.title(), + projectTitleStyle()); + if (!label.stack().isBlank()) { + rich.style(" (" + label.stack() + + ")", + projectContextStyle()); + } + if (!body.isBlank()) { + rich.style(" - " + body, + projectBodyStyle()); + } + }))); + } + }); + } - // -- Headings ------------------------------------------------------- - - private void addRailHeading(SectionBuilder section, String title) { - section.spacing(3) - .addParagraph(paragraph -> paragraph - .text(title.toUpperCase(Locale.ROOT)) - .textStyle(railHeadingStyle()) - .margin(DocumentInsets.zero())) - .addLine(line -> line - .horizontal(82) - .color(NAVY_SOFT) - .thickness(0.8) - .margin(DocumentInsets.bottom(2))); - } + // -- Headings ------------------------------------------------------- + + private void addRailHeading(SectionBuilder section, String title) { + section.spacing(3) + .addParagraph(paragraph -> paragraph + .text(title.toUpperCase(Locale.ROOT)) + .textStyle(railHeadingStyle()) + .margin(DocumentInsets.zero())) + .addLine(line -> line + .horizontal(82) + .color(NAVY_SOFT) + .thickness(0.8) + .margin(DocumentInsets.bottom(2))); + } - private void addMainHeading(SectionBuilder section, String title) { - section.spacing(5) - .addParagraph(paragraph -> paragraph - .text(title.toUpperCase(Locale.ROOT)) - .textStyle(mainHeadingStyle()) - .margin(DocumentInsets.zero())) - .addLine(line -> line - .horizontal(176) - .color(GREEN) - .thickness(1.0) - .margin(DocumentInsets.bottom(1))); - } + private void addMainHeading(SectionBuilder section, String title) { + section.spacing(5) + .addParagraph(paragraph -> paragraph + .text(title.toUpperCase(Locale.ROOT)) + .textStyle(mainHeadingStyle()) + .margin(DocumentInsets.zero())) + .addLine(line -> line + .horizontal(176) + .color(GREEN) + .thickness(1.0) + .margin(DocumentInsets.bottom(1))); + } - private void addRoleHeader(SectionBuilder card, CvEntry entry) { - card.addParagraph(paragraph -> paragraph - .textStyle(roleTitleStyle()) - .margin(DocumentInsets.zero()) - .rich(rich -> { - rich.style(entry.title(), roleTitleStyle()); - if (!entry.date().isBlank()) { - rich.style(" / " + entry.date(), - roleDateStyle()); - } - })); - } + private void addRoleHeader(SectionBuilder card, CvEntry entry) { + card.addParagraph(paragraph -> paragraph + .textStyle(roleTitleStyle()) + .margin(DocumentInsets.zero()) + .rich(rich -> { + rich.style(entry.title(), roleTitleStyle()); + if (!entry.date().isBlank()) { + rich.style(" / " + entry.date(), + roleDateStyle()); + } + })); + } - // -- Style factories ------------------------------------------------ + // -- Style factories ------------------------------------------------ - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, - DocumentColor.WHITE); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, + DocumentColor.WHITE); + } - private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 7.6, - DocumentTextDecoration.BOLD, - SUBTITLE_COLOR); - } + private DocumentTextStyle subtitleStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 7.6, + DocumentTextDecoration.BOLD, + SUBTITLE_COLOR); + } - private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - CONTACT_META); - } + private DocumentTextStyle contactMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + CONTACT_META); + } - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - CONTACT_LINK); - } + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + CONTACT_LINK); + } - private DocumentTextStyle railHeadingStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - 7.4, - DocumentTextDecoration.BOLD, - GREEN); - } + private DocumentTextStyle railHeadingStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + 7.4, + DocumentTextDecoration.BOLD, + GREEN); + } - private DocumentTextStyle railBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 6.95, - DocumentTextDecoration.DEFAULT, - RAIL_TEXT); - } + private DocumentTextStyle railBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 6.95, + DocumentTextDecoration.DEFAULT, + RAIL_TEXT); + } - private DocumentTextStyle railLabelStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 6.95, - DocumentTextDecoration.BOLD, - GREEN); - } + private DocumentTextStyle railLabelStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 6.95, + DocumentTextDecoration.BOLD, + GREEN); + } - private DocumentTextStyle railTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 6.95, - DocumentTextDecoration.BOLD, - DocumentColor.WHITE); - } + private DocumentTextStyle railTitleStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 6.95, + DocumentTextDecoration.BOLD, + DocumentColor.WHITE); + } - private DocumentTextStyle railDateStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 6.7, - DocumentTextDecoration.DEFAULT, - RAIL_DATE); - } + private DocumentTextStyle railDateStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 6.7, + DocumentTextDecoration.DEFAULT, + RAIL_DATE); + } - private DocumentTextStyle mainHeadingStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - GREEN); - } + private DocumentTextStyle mainHeadingStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + GREEN); + } - private DocumentTextStyle profileHeadingStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - 8.0, - DocumentTextDecoration.BOLD, - GREEN); - } + private DocumentTextStyle profileHeadingStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + 8.0, + DocumentTextDecoration.BOLD, + GREEN); + } - private DocumentTextStyle profileBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 7.75, - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle profileBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 7.75, + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle roleTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeEntryTitle(), - DocumentTextDecoration.BOLD, - theme.palette().ink()); - } + private DocumentTextStyle roleTitleStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntryTitle(), + DocumentTextDecoration.BOLD, + theme.palette().ink()); + } - private DocumentTextStyle roleDateStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeEntryDate(), - DocumentTextDecoration.BOLD, - GREEN); - } + private DocumentTextStyle roleDateStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntryDate(), + DocumentTextDecoration.BOLD, + GREEN); + } - private DocumentTextStyle subtitleBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeEntrySubtitle(), - DocumentTextDecoration.DEFAULT, - theme.palette().muted()); - } + private DocumentTextStyle subtitleBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntrySubtitle(), + DocumentTextDecoration.DEFAULT, + theme.palette().muted()); + } - private DocumentTextStyle roleBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle roleBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle projectTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 7.35, - DocumentTextDecoration.BOLD, - theme.palette().ink()); - } + private DocumentTextStyle projectTitleStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 7.35, + DocumentTextDecoration.BOLD, + theme.palette().ink()); + } - private DocumentTextStyle projectContextStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 6.85, - DocumentTextDecoration.DEFAULT, - GREEN); - } + private DocumentTextStyle projectContextStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 6.85, + DocumentTextDecoration.DEFAULT, + GREEN); + } - private DocumentTextStyle projectBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - 7.1, - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); + private DocumentTextStyle projectBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + 7.1, + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } } - } // -- Static helpers ---------------------------------------------------- private static boolean hasContent(CvSection section) { - return section != null && SectionLookup.hasContent(section); + return SectionLookup.hasContent(section); } private static String compactValues(String value, int maxItems) { diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java index 4ec35d8fa..274529621 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java @@ -12,11 +12,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; import com.demcha.compose.document.templates.cv.v2.components.SectionDispatcher; -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.CvLink; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -import com.demcha.compose.document.templates.cv.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; import com.demcha.compose.document.templates.cv.v2.widgets.SectionHeader; @@ -45,13 +41,19 @@ */ public final class Executive { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "executive"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Executive"; - /** Recommended page margin (in points) — generous for an executive feel. */ + /** + * Recommended page margin (in points) — generous for an executive feel. + */ public static final double RECOMMENDED_MARGIN = 28.0; /** @@ -92,156 +94,150 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; - } - - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CvV2ExecutiveRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - addHeader(flow, doc.identity(), width); - - List sections = doc.sectionsIn(Slot.MAIN); - for (int i = 0; i < sections.size(); i++) { - CvSection sec = sections.get(i); - int idx = i; - flow.addSection("CvV2ExecutiveTitle_" + idx, host -> - SectionHeader.flat(host, - sec.title().toUpperCase(Locale.ROOT), - ACCENT, theme)); - flow.addSection("CvV2ExecutiveBody_" + idx, host -> - SectionDispatcher.renderBody(host, sec, theme)); + public String id() { + return ID; } - flow.build(); - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - private void addHeader(PageFlowBuilder flow, CvIdentity identity, - double width) { - flow.addSection("CvV2ExecutiveHeader", section -> { - section.spacing(2) - .padding(DocumentInsets.zero()); - Headline.uppercaseLeftAligned(section, identity.name(), theme, - nameStyle()); - String meta = joinPipe(identity.contact().address(), - identity.contact().phone()); - if (!meta.isBlank()) { - section.addParagraph(paragraph -> paragraph - .text(meta) - .textStyle(metaStyle()) - .align(TextAlign.LEFT) - .margin(DocumentInsets.top(2))); + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CvV2ExecutiveRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + addHeader(flow, doc.identity(), width); + + List sections = doc.sectionsIn(Slot.MAIN); + for (int i = 0; i < sections.size(); i++) { + CvSection sec = sections.get(i); + int idx = i; + flow.addSection("CvV2ExecutiveTitle_" + idx, host -> + SectionHeader.flat(host, + sec.title().toUpperCase(Locale.ROOT), + ACCENT, theme)); + flow.addSection("CvV2ExecutiveBody_" + idx, host -> + SectionDispatcher.renderBody(host, sec, theme)); } - addLinkRow(section, identity); - section.addLine(line -> line - .name("CvV2ExecutiveHeaderRule") - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(DocumentInsets.top(5))); - }); - } - private void addLinkRow(SectionBuilder section, CvIdentity identity) { - boolean hasEmail = !identity.contact().email().isBlank(); - boolean hasLinks = !identity.links().isEmpty(); - if (!hasEmail && !hasLinks) { - return; + flow.build(); } - DocumentTextStyle bodyStyle = linkRowBodyStyle(); - DocumentTextStyle linkStyle = linkRowLinkStyle(); - section.addParagraph(paragraph -> paragraph - .textStyle(bodyStyle) - .align(TextAlign.LEFT) - .margin(DocumentInsets.top(1)) - .rich(rich -> { - boolean first = true; - String email = identity.contact().email(); - if (!email.isBlank()) { - rich.with(email, linkStyle, - new DocumentLinkOptions("mailto:" + email)); - first = false; - } - for (CvLink link : identity.links()) { - if (link.label().isBlank()) { - continue; - } - if (!first) { - rich.style(" | ", bodyStyle); + + private void addHeader(PageFlowBuilder flow, CvIdentity identity, + double width) { + flow.addSection("CvV2ExecutiveHeader", section -> { + section.spacing(2) + .padding(DocumentInsets.zero()); + Headline.uppercaseLeftAligned(section, identity.name(), theme, + nameStyle()); + String meta = joinPipe(identity.contact().address(), + identity.contact().phone()); + if (!meta.isBlank()) { + section.addParagraph(paragraph -> paragraph + .text(meta) + .textStyle(metaStyle()) + .align(TextAlign.LEFT) + .margin(DocumentInsets.top(2))); + } + addLinkRow(section, identity); + section.addLine(line -> line + .name("CvV2ExecutiveHeaderRule") + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(DocumentInsets.top(5))); + }); + } + + private void addLinkRow(SectionBuilder section, CvIdentity identity) { + boolean hasEmail = !identity.contact().email().isBlank(); + boolean hasLinks = !identity.links().isEmpty(); + if (!hasEmail && !hasLinks) { + return; + } + DocumentTextStyle bodyStyle = linkRowBodyStyle(); + DocumentTextStyle linkStyle = linkRowLinkStyle(); + section.addParagraph(paragraph -> paragraph + .textStyle(bodyStyle) + .align(TextAlign.LEFT) + .margin(DocumentInsets.top(1)) + .rich(rich -> { + boolean first = true; + String email = identity.contact().email(); + if (!email.isBlank()) { + rich.with(email, linkStyle, + new DocumentLinkOptions("mailto:" + email)); + first = false; } - first = false; - if (link.url().isBlank()) { - rich.style(link.label(), bodyStyle); - } else { - rich.with(link.label(), linkStyle, - new DocumentLinkOptions(link.url())); + for (CvLink link : identity.links()) { + if (link.label().isBlank()) { + continue; + } + if (!first) { + rich.style(" | ", bodyStyle); + } + first = false; + if (link.url().isBlank()) { + rich.style(link.label(), bodyStyle); + } else { + rich.with(link.label(), linkStyle, + new DocumentLinkOptions(link.url())); + } } - } - })); - } + })); + } - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, - PRIMARY_NAME); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(FontName.POPPINS, + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, + PRIMARY_NAME); + } - private DocumentTextStyle metaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle metaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle linkRowBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle linkRowBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle linkRowLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.UNDERLINE, - ACCENT); - } + private DocumentTextStyle linkRowLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.UNDERLINE, + ACCENT); + } - private static String joinPipe(String... parts) { - StringBuilder sb = new StringBuilder(); - for (String part : parts) { - if (part == null || part.isBlank()) { - continue; + private static String joinPipe(String... parts) { + StringBuilder sb = new StringBuilder(); + for (String part : parts) { + if (part == null || part.isBlank()) { + continue; + } + if (sb.length() > 0) { + sb.append(" | "); + } + sb.append(part.trim()); } - if (sb.length() > 0) { - sb.append(" | "); - } - sb.append(part.trim()); + return sb.toString(); } - return sb.toString(); } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MinimalUnderlined.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MinimalUnderlined.java index 5b67ce36e..db3475159 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MinimalUnderlined.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MinimalUnderlined.java @@ -44,13 +44,19 @@ */ public final class MinimalUnderlined { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "minimal-underlined"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Minimal Underlined"; - /** Recommended page margin (in points). */ + /** + * Recommended page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 32.0; private MinimalUnderlined() { @@ -76,54 +82,48 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } - - @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - PageFlowBuilder pageFlow = document.dsl() - .pageFlow() - .name("CvV2MinimalRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("Headline", section -> - Headline.spacedCentered(section, doc.identity().name(), theme)) - .addSection("Contact", section -> { - section.accentBottom(theme.palette().rule(), - theme.spacing().accentRuleWidth()); - ContactLine.centered(section, doc.identity(), theme); - }); - - // Single-column preset — only renders MAIN-slot sections. - // Sidebar / footer placements are intentionally dropped here. - List sections = doc.sectionsIn(Slot.MAIN); - for (int i = 0; i < sections.size(); i++) { - final CvSection sec = sections.get(i); - final int idx = i; - pageFlow.addSection("Title_" + idx, host -> - SectionHeader.underlined(host, sec.title(), theme)); - pageFlow.addSection("Body_" + idx, host -> - SectionDispatcher.renderBody(host, sec, theme)); + @Override + public String displayName() { + return DISPLAY_NAME; } - pageFlow.build(); + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + PageFlowBuilder pageFlow = document.dsl() + .pageFlow() + .name("CvV2MinimalRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("Headline", section -> + Headline.spacedCentered(section, doc.identity().name(), theme)) + .addSection("Contact", section -> { + section.accentBottom(theme.palette().rule(), + theme.spacing().accentRuleWidth()); + ContactLine.centered(section, doc.identity(), theme); + }); + + // Single-column preset — only renders MAIN-slot sections. + // Sidebar / footer placements are intentionally dropped here. + List sections = doc.sectionsIn(Slot.MAIN); + for (int i = 0; i < sections.size(); i++) { + final CvSection sec = sections.get(i); + final int idx = i; + pageFlow.addSection("Title_" + idx, host -> + SectionHeader.underlined(host, sec.title(), theme)); + pageFlow.addSection("Body_" + idx, host -> + SectionDispatcher.renderBody(host, sec, theme)); + } + + pageFlow.build(); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java index b6a24c12b..b04108b3b 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java @@ -9,14 +9,8 @@ import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.node.DocumentNode; import com.demcha.compose.document.node.ParagraphNode; -import com.demcha.compose.document.node.ShapeNode; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.ClipPolicy; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableCell; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; @@ -25,19 +19,7 @@ import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvLink; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; import com.demcha.compose.document.templates.cv.v2.widgets.IconTextRow; @@ -49,7 +31,6 @@ import java.io.UncheckedIOException; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; @@ -128,22 +109,34 @@ */ public final class MintEditorial { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "mint-editorial"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Mint Editorial"; - /** Recommended symmetric page margin (in points). */ + /** + * Recommended symmetric page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 48.0; - /** Sidebar column weight; main column gets {@code 1 - SIDEBAR_WEIGHT}. */ + /** + * Sidebar column weight; main column gets {@code 1 - SIDEBAR_WEIGHT}. + */ private static final double SIDEBAR_WEIGHT = 0.31; - /** Main column weight. */ + /** + * Main column weight. + */ private static final double MAIN_WEIGHT = 1.0 - SIDEBAR_WEIGHT; - /** Horizontal gap (points) between the sidebar and main columns. */ + /** + * Horizontal gap (points) between the sidebar and main columns. + */ private static final double COLUMN_GAP = 40.0; /** @@ -156,25 +149,39 @@ public final class MintEditorial { */ private static final double BLOCK_GAP = 22.0; - /** Visual gap (points) between the two grid columns in Awards / References. */ + /** + * Visual gap (points) between the two grid columns in Awards / References. + */ private static final double GRID_COLUMN_GAP = 24.0; - /** Experience entries rendered on page 1; the rest go to page 2. */ + /** + * Experience entries rendered on page 1; the rest go to page 2. + */ private static final int EXPERIENCE_PAGE_ONE = 2; - /** Expertise category labels shown beneath the badge. */ + /** + * Expertise category labels shown beneath the badge. + */ private static final int EXPERTISE_LIMIT = 6; - /** Skill bars rendered in the page-2 sidebar. */ + /** + * Skill bars rendered in the page-2 sidebar. + */ private static final int SKILL_LIMIT = 6; - /** Inline contact / social icon edge length (points). */ + /** + * Inline contact / social icon edge length (points). + */ private static final double CONTACT_ICON_SIZE = 9.0; - /** Social icon edge length (points) — the filled badges read larger. */ + /** + * Social icon edge length (points) — the filled badges read larger. + */ private static final double SOCIAL_ICON_SIZE = 12.0; - /** Expertise badge edge length (points). */ + /** + * Expertise badge edge length (points). + */ private static final double BADGE_SIZE = 36.0; // Banded-masthead canvas geometry. These values reproduce the DEFAULT @@ -193,17 +200,25 @@ public final class MintEditorial { // typography / spacing / margin change moves the masthead and silently // invalidates these hand-measured coordinates. - /** Canvas flow footprint (points) — sized so the page-1 row starts at the - * same y as the default render. */ + /** + * Canvas flow footprint (points) — sized so the page-1 row starts at the + * same y as the default render. + */ static final double MASTHEAD_CANVAS_HEIGHT = 143.76; - /** Canvas-local y (points) of the masthead name — matches the default top. */ + /** + * Canvas-local y (points) of the masthead name — matches the default top. + */ static final double MASTHEAD_NAME_Y = 48.0; - /** Canvas-local y (points) of the masthead tagline — matches the default top. */ + /** + * Canvas-local y (points) of the masthead tagline — matches the default top. + */ static final double MASTHEAD_TAGLINE_Y = 87.4; - /** Canvas-local y (points) of the masthead rule — matches the default top. */ + /** + * Canvas-local y (points) of the masthead rule — matches the default top. + */ static final double MASTHEAD_RULE_Y = 123.76; private static final String ICON_ROOT = "/templates/cv/mint-editorial/icons/"; @@ -388,13 +403,21 @@ public Options build() { private static final class Template implements DocumentTemplate { private final CvTheme theme; - /** Accent for the tagline + section headings (defaults to mint). */ + /** + * Accent for the tagline + section headings (defaults to mint). + */ private final DocumentColor accent; - /** Masthead rule colour (defaults to the accent). */ + /** + * Masthead rule colour (defaults to the accent). + */ private final DocumentColor ruleColor; - /** Masthead name colour (defaults to ink). */ + /** + * Masthead name colour (defaults to ink). + */ private final DocumentColor nameColor; - /** Optional page-1 header band; null = no band (white header). */ + /** + * Optional page-1 header band; null = no band (white header). + */ private final DocumentColor headerBandColor; Template(CvTheme theme, Options options) { @@ -603,11 +626,11 @@ private void addBandedHeader(SectionBuilder section, CvIdentity identity, boolean hasTagline = jobTitle != null && !jobTitle.isBlank(); ParagraphNode tagline = hasTagline ? new ParagraphBuilder() - .name("CvV2MintEditorialHeaderTagline") - .text(TextOrnaments.spacedUpper(jobTitle)) - .textStyle(taglineStyle()) - .align(TextAlign.CENTER) - .build() + .name("CvV2MintEditorialHeaderTagline") + .text(TextOrnaments.spacedUpper(jobTitle)) + .textStyle(taglineStyle()) + .align(TextAlign.CENTER) + .build() : null; section.addCanvas(pageWidth, canvasH, canvas -> { @@ -798,7 +821,7 @@ private void addSocial(SectionBuilder section, CvIdentity identity) { private void addProfile(SectionBuilder section, CvSection profile) { if (!(profile instanceof ParagraphSection paragraph) - || paragraph.body().isBlank()) { + || paragraph.body().isBlank()) { return; } section.addSection("CvV2MintEditorialProfile", block -> { @@ -1197,7 +1220,9 @@ private static BodyParts splitBody(String body) { return new BodyParts(String.join(" ", prose), List.copyOf(bullets)); } - /** Prose + bullet split of an experience entry body. */ + /** + * Prose + bullet split of an experience entry body. + */ private record BodyParts(String prose, List bullets) { } @@ -1219,7 +1244,9 @@ private static String extractEmail(String line) { return null; } - /** Maps a contact link label to its small inline glyph file. */ + /** + * Maps a contact link label to its small inline glyph file. + */ private static String contactIconFile(String label) { String normalized = SectionLookup.normalize(label); if (normalized.contains("linkedin")) { @@ -1238,7 +1265,9 @@ private static String contactIconFile(String label) { return "website.png"; } - /** Maps a social link label to its filled-badge glyph file. */ + /** + * Maps a social link label to its filled-badge glyph file. + */ private static String socialIconFile(String label) { String normalized = SectionLookup.normalize(label); if (normalized.contains("twitter")) { diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ModernProfessional.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ModernProfessional.java index 699681f2e..874fc91fd 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ModernProfessional.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ModernProfessional.java @@ -52,23 +52,35 @@ */ public final class ModernProfessional { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "modern-professional"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Modern Professional"; - /** Recommended page margin (in points) — matches the legacy v1 preset. */ + /** + * Recommended page margin (in points) — matches the legacy v1 preset. + */ public static final double RECOMMENDED_MARGIN = 18.0; - /** Slate-blue used by the display name. Preset-specific. */ + /** + * Slate-blue used by the display name. Preset-specific. + */ private static final DocumentColor NAME_COLOR = DocumentColor.rgb(44, 62, 80); - /** Bright-blue used by section titles. Preset-specific. */ + /** + * Bright-blue used by section titles. Preset-specific. + */ private static final DocumentColor SECTION_TITLE_COLOR = DocumentColor.rgb(41, 128, 185); - /** Royal-blue used by contact links. Preset-specific. */ + /** + * Royal-blue used by contact links. Preset-specific. + */ private static final DocumentColor LINK_COLOR = DocumentColor.rgb(65, 105, 225); private ModernProfessional() { @@ -97,83 +109,77 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - // Preset-specific styles — built once, fed to widgets. - // These cannot live in the theme because their colours are - // unique to this preset (no other preset uses slate-blue - // for the name or royal-blue for links). - DocumentTextStyle nameStyle = DocumentTextStyle.builder() - .fontName(FontName.HELVETICA_BOLD) - .size(theme.typography().sizeHeadline()) - .decoration(DocumentTextDecoration.BOLD) - .color(NAME_COLOR) - .build(); - DocumentTextStyle contactBodyStyle = DocumentTextStyle.builder() - .fontName(FontName.HELVETICA) - .size(theme.typography().sizeContact()) - .color(theme.palette().ink()) - .build(); - DocumentTextStyle contactLinkStyle = DocumentTextStyle.builder() - .fontName(FontName.HELVETICA) - .size(theme.typography().sizeContact()) - .decoration(DocumentTextDecoration.UNDERLINE) - .color(LINK_COLOR) - .build(); - DocumentTextStyle contactSeparatorStyle = DocumentTextStyle.builder() - .fontName(FontName.HELVETICA) - .size(theme.typography().sizeContact()) - .color(theme.palette().rule()) - .build(); - - PageFlowBuilder pageFlow = document.dsl() - .pageFlow() - .name("CvV2ModernRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addSection("Header", section -> - Headline.rightAligned(section, doc.identity().name(), - theme, nameStyle)) - .addSection("Contact", section -> { - section.accentBottom(theme.palette().rule(), - theme.spacing().accentRuleWidth()); - ContactLine.twoRowRightAligned(section, doc.identity(), - theme, contactBodyStyle, contactLinkStyle, - contactSeparatorStyle); - }); - - // Single-column preset — only MAIN slot. - List sections = doc.sectionsIn(Slot.MAIN); - for (int i = 0; i < sections.size(); i++) { - final CvSection sec = sections.get(i); - final int idx = i; - pageFlow.addSection("Title_" + idx, host -> - SectionHeader.flat(host, sec.title(), SECTION_TITLE_COLOR, theme)); - pageFlow.addSection("Body_" + idx, host -> - SectionDispatcher.renderBody(host, sec, theme)); + @Override + public String displayName() { + return DISPLAY_NAME; } - pageFlow.build(); + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + // Preset-specific styles — built once, fed to widgets. + // These cannot live in the theme because their colours are + // unique to this preset (no other preset uses slate-blue + // for the name or royal-blue for links). + DocumentTextStyle nameStyle = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA_BOLD) + .size(theme.typography().sizeHeadline()) + .decoration(DocumentTextDecoration.BOLD) + .color(NAME_COLOR) + .build(); + DocumentTextStyle contactBodyStyle = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA) + .size(theme.typography().sizeContact()) + .color(theme.palette().ink()) + .build(); + DocumentTextStyle contactLinkStyle = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA) + .size(theme.typography().sizeContact()) + .decoration(DocumentTextDecoration.UNDERLINE) + .color(LINK_COLOR) + .build(); + DocumentTextStyle contactSeparatorStyle = DocumentTextStyle.builder() + .fontName(FontName.HELVETICA) + .size(theme.typography().sizeContact()) + .color(theme.palette().rule()) + .build(); + + PageFlowBuilder pageFlow = document.dsl() + .pageFlow() + .name("CvV2ModernRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addSection("Header", section -> + Headline.rightAligned(section, doc.identity().name(), + theme, nameStyle)) + .addSection("Contact", section -> { + section.accentBottom(theme.palette().rule(), + theme.spacing().accentRuleWidth()); + ContactLine.twoRowRightAligned(section, doc.identity(), + theme, contactBodyStyle, contactLinkStyle, + contactSeparatorStyle); + }); + + // Single-column preset — only MAIN slot. + List sections = doc.sectionsIn(Slot.MAIN); + for (int i = 0; i < sections.size(); i++) { + final CvSection sec = sections.get(i); + final int idx = i; + pageFlow.addSection("Title_" + idx, host -> + SectionHeader.flat(host, sec.title(), SECTION_TITLE_COLOR, theme)); + pageFlow.addSection("Body_" + idx, host -> + SectionDispatcher.renderBody(host, sec, theme)); + } + + pageFlow.build(); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java index 74692ea2d..bf3c6316a 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java @@ -7,48 +7,18 @@ import com.demcha.compose.document.dsl.ParagraphBuilder; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.image.DocumentImageData; -import com.demcha.compose.document.node.DocumentLinkOptions; -import com.demcha.compose.document.node.InlineImageAlignment; -import com.demcha.compose.document.node.LayerAlign; -import com.demcha.compose.document.node.LayerStackNode; -import com.demcha.compose.document.node.SpacerNode; -import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.node.*; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.LabelValueRenderer; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; -import com.demcha.compose.document.templates.cv.v2.components.ProjectRenderer; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvLink; -import com.demcha.compose.document.templates.cv.v2.data.CvName; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.components.*; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.font.FontName; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** @@ -73,35 +43,51 @@ */ public final class MonogramSidebar { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "monogram-sidebar"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Monogram Sidebar"; - /** Recommended page margin (in points) — 0 so the sidebar bleeds to the edge. */ + /** + * Recommended page margin (in points) — 0 so the sidebar bleeds to the edge. + */ public static final double RECOMMENDED_MARGIN = 0.0; - /** V1 default muted-gold accent — used for the subtitle, dates. */ + /** + * V1 default muted-gold accent — used for the subtitle, dates. + */ private static final DocumentColor DEFAULT_ACCENT = DocumentColor.rgb(158, 146, 104); - /** V1 default dark monogram ring + initials colour. */ + /** + * V1 default dark monogram ring + initials colour. + */ private static final DocumentColor DEFAULT_MONOGRAM_RING = DocumentColor.rgb(54, 62, 74); - /** V1 dark main-column rule colour (theme rule is sidebar-only). */ + /** + * V1 dark main-column rule colour (theme rule is sidebar-only). + */ private static final DocumentColor MAIN_RULE = DocumentColor.rgb(72, 79, 84); - /** PT Serif used only for the monogram initials inside the ring badge. */ + /** + * PT Serif used only for the monogram initials inside the ring badge. + */ private static final FontName MONOGRAM_FONT = FontName.PT_SERIF; private static final double MONOGRAM_DIAMETER = 122; private static final double SIDEBAR_RULE_WIDTH = 118; private static final double CONTACT_ICON_SIZE = 22; - /** Sidebar column width as a fraction of the page width. */ + /** + * Sidebar column width as a fraction of the page width. + */ private static final double SIDEBAR_WIDTH_RATIO = 0.33; private static final double MAIN_SECTION_RULE_WIDTH = 355.0; @@ -178,16 +164,16 @@ public static DocumentTemplate create(CvTheme theme, * back to the theme palette / V1 defaults documented on each * accessor. * - * @param sidebarFillColor sidebar (left column) background fill; - * {@code null} → {@code theme.palette().banner()} - * @param mainFillColor main (right column) background fill; - * {@code null} → {@code theme.palette().mainFill()} - * (defaults to {@link DocumentColor#WHITE}) - * @param accentColor muted-gold accent for subtitle, - * education date, experience date; - * {@code null} → V1 rgb(158,146,104) - * @param monogramRingColor ring stroke + initials colour; - * {@code null} → V1 rgb(54,62,74) + * @param sidebarFillColor sidebar (left column) background fill; + * {@code null} → {@code theme.palette().banner()} + * @param mainFillColor main (right column) background fill; + * {@code null} → {@code theme.palette().mainFill()} + * (defaults to {@link DocumentColor#WHITE}) + * @param accentColor muted-gold accent for subtitle, + * education date, experience date; + * {@code null} → V1 rgb(158,146,104) + * @param monogramRingColor ring stroke + initials colour; + * {@code null} → V1 rgb(54,62,74) */ public record Options(DocumentColor sidebarFillColor, DocumentColor mainFillColor, @@ -823,7 +809,7 @@ private DocumentTextStyle mainEntryDateStyle() { // -- Static helpers ---------------------------------------------------- private static boolean hasContent(CvSection section) { - return section != null && SectionLookup.hasContent(section); + return SectionLookup.hasContent(section); } private static String initials(CvName name) { diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java index 74b0e0abe..36c8950f2 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java @@ -3,29 +3,10 @@ import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentCornerRadius; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.EntryCompactRenderer; -import com.demcha.compose.document.templates.cv.v2.components.LabelValueRenderer; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; -import com.demcha.compose.document.templates.cv.v2.components.ProjectRenderer; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.components.*; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; @@ -33,6 +14,7 @@ import com.demcha.compose.document.templates.cv.v2.widgets.SectionModule; import java.util.List; +import java.util.Locale; import java.util.Objects; /** @@ -69,13 +51,19 @@ */ public final class NordicClean { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "nordic-clean"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Nordic Clean"; - /** Recommended page margin (in points). */ + /** + * Recommended page margin (in points). + */ public static final double RECOMMENDED_MARGIN = 18.0; private static final DocumentColor DEFAULT_ACCENT = @@ -139,9 +127,13 @@ public static DocumentTemplate create(CvTheme theme, * and projects. */ public enum RailSide { - /** Skills rail on the left, experience/projects on the right. */ + /** + * Skills rail on the left, experience/projects on the right. + */ LEFT, - /** Skills rail on the right, experience/projects on the left. */ + /** + * Skills rail on the right, experience/projects on the left. + */ RIGHT } @@ -161,7 +153,9 @@ public record Options(RailSide railSide, DocumentColor railFillColor, DocumentColor profileFillColor) { - /** Normalises null rail side, accent, and rail fill to their defaults. */ + /** + * Normalises null rail side, accent, and rail fill to their defaults. + */ public Options { railSide = railSide == null ? RailSide.LEFT : railSide; accentColor = accentColor == null ? DEFAULT_ACCENT : accentColor; @@ -263,284 +257,276 @@ public Options build() { } } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - private final Options options; - - Template(CvTheme theme, Options options) { - this.theme = theme; - this.options = options; - } + private record Template(CvTheme theme, Options options) implements DocumentTemplate { @Override - public String id() { - return ID; - } + public String id() { + return ID; + } - @Override - public String displayName() { - return DISPLAY_NAME; - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - List sections = doc.sectionsIn(Slot.MAIN); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CvV2NordicCleanRoot") - .spacing(theme.spacing().pageFlowSpacing()); - - addHeader(flow, doc); - addProfile(flow, SectionLookup.firstMatching(sections, SUMMARY_KEYS)); - addBody(flow, sections); - flow.build(); - } + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + List sections = doc.sectionsIn(Slot.MAIN); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CvV2NordicCleanRoot") + .spacing(theme.spacing().pageFlowSpacing()); + + addHeader(flow, doc); + addProfile(flow, SectionLookup.firstMatching(sections, SUMMARY_KEYS)); + addBody(flow, sections); + flow.build(); + } - private void addHeader(PageFlowBuilder flow, CvDocument doc) { - flow.addRow("CvV2NordicCleanHeader", row -> row - .spacing(14) - .weights(1.2, 0.8) - .addSection("Identity", identity -> { - identity.spacing(3) - .padding(new DocumentInsets(1, 0, 2, 0)); - Headline.uppercaseLeftAligned(identity, - doc.identity().name(), theme, - headlineStyle()); - identity.addShape(shape -> shape - .name("CvV2NordicCleanNameAccent") - .size(64, 2.6) - .fillColor(options.accentColor()) - .cornerRadius(1.3) - .margin(DocumentInsets.zero())); - if (!doc.identity().jobTitle().isBlank()) { - identity.addParagraph(paragraph -> paragraph - .text(MarkdownInline.plainText( - doc.identity().jobTitle()) - .toUpperCase(java.util.Locale.ROOT)) - .textStyle(CvTextStyles.of(theme.typography().bodyFont(), - 7.7, - DocumentTextDecoration.BOLD, - theme.palette().muted())) + private void addHeader(PageFlowBuilder flow, CvDocument doc) { + flow.addRow("CvV2NordicCleanHeader", row -> row + .spacing(14) + .weights(1.2, 0.8) + .addSection("Identity", identity -> { + identity.spacing(3) + .padding(new DocumentInsets(1, 0, 2, 0)); + Headline.uppercaseLeftAligned(identity, + doc.identity().name(), theme, + headlineStyle()); + identity.addShape(shape -> shape + .name("CvV2NordicCleanNameAccent") + .size(64, 2.6) + .fillColor(options.accentColor()) + .cornerRadius(1.3) .margin(DocumentInsets.zero())); - } - }) - .addSection("Contact", contact -> - ContactLine.rightAlignedStacked(contact, - doc.identity(), theme, - contactMetaStyle(), contactLinkStyle()))); - } - - private void addProfile(PageFlowBuilder flow, CvSection section) { - if (!(section instanceof ParagraphSection profile) - || profile.body().isBlank()) { - return; + if (!doc.identity().jobTitle().isBlank()) { + identity.addParagraph(paragraph -> paragraph + .text(MarkdownInline.plainText( + doc.identity().jobTitle()) + .toUpperCase(Locale.ROOT)) + .textStyle(CvTextStyles.of(theme.typography().bodyFont(), + 7.7, + DocumentTextDecoration.BOLD, + theme.palette().muted())) + .margin(DocumentInsets.zero())); + } + }) + .addSection("Contact", contact -> + ContactLine.rightAlignedStacked(contact, + doc.identity(), theme, + contactMetaStyle(), contactLinkStyle()))); } - ProfileBand.render(flow, "CvV2NordicCleanProfile", "PROFILE", - profile.body(), ProfileBand.Style.builder() - .spacing(4) - .padding(new DocumentInsets(8, 10, 8, 10)) - .fillColor(options.resolvedProfileFill(theme)) - .accentLeft(options.accentColor(), 3.0) - .cornerRadius(DocumentCornerRadius.right(4)) - .titleStyle(sectionTitleStyle()) - .bodyStyle(bodyStyle(7.85, theme.palette().ink())) - .bodyLineSpacing(1.25) - .build()); - } - - private void addBody(PageFlowBuilder flow, List sections) { - flow.addRow("CvV2NordicCleanBody", row -> { - row.spacing(15); - if (options.railSide() == RailSide.LEFT) { - row.weights(0.72, 1.28) - .addSection("Rail", - rail -> addRail(rail, sections)) - .addSection("Main", - main -> addMain(main, sections)); - } else { - row.weights(1.28, 0.72) - .addSection("Main", - main -> addMain(main, sections)) - .addSection("Rail", - rail -> addRail(rail, sections)); + private void addProfile(PageFlowBuilder flow, CvSection section) { + if (!(section instanceof ParagraphSection profile) + || profile.body().isBlank()) { + return; } - }); - } - private void addRail(SectionBuilder rail, List sections) { - rail.spacing(8) - .padding(new DocumentInsets(9, 10, 9, 10)) - .fillColor(options.railFillColor()) - .stroke(DocumentStroke.of(theme.palette().rule(), 0.35)) - .cornerRadius(4); - addSkills(rail, SectionLookup.firstMatching(sections, SKILL_KEYS)); - addEducation(rail, SectionLookup.firstMatching(sections, EDUCATION_KEYS)); - addAdditional(rail, SectionLookup.firstMatching(sections, ADDITIONAL_KEYS)); - } + ProfileBand.render(flow, "CvV2NordicCleanProfile", "PROFILE", + profile.body(), ProfileBand.Style.builder() + .spacing(4) + .padding(new DocumentInsets(8, 10, 8, 10)) + .fillColor(options.resolvedProfileFill(theme)) + .accentLeft(options.accentColor(), 3.0) + .cornerRadius(DocumentCornerRadius.right(4)) + .titleStyle(sectionTitleStyle()) + .bodyStyle(bodyStyle(7.85, theme.palette().ink())) + .bodyLineSpacing(1.25) + .build()); + } - private void addMain(SectionBuilder main, List sections) { - main.spacing(9); - addExperience(main, SectionLookup.firstMatching(sections, EXPERIENCE_KEYS)); - addProjects(main, SectionLookup.firstMatching(sections, PROJECT_KEYS)); - } + private void addBody(PageFlowBuilder flow, List sections) { + flow.addRow("CvV2NordicCleanBody", row -> { + row.spacing(15); + if (options.railSide() == RailSide.LEFT) { + row.weights(0.72, 1.28) + .addSection("Rail", + rail -> addRail(rail, sections)) + .addSection("Main", + main -> addMain(main, sections)); + } else { + row.weights(1.28, 0.72) + .addSection("Main", + main -> addMain(main, sections)) + .addSection("Rail", + rail -> addRail(rail, sections)); + } + }); + } - private void addSkills(SectionBuilder parent, CvSection section) { - if (!(section instanceof SkillsSection skills) - || skills.groups().isEmpty()) { - return; + private void addRail(SectionBuilder rail, List sections) { + rail.spacing(8) + .padding(new DocumentInsets(9, 10, 9, 10)) + .fillColor(options.railFillColor()) + .stroke(DocumentStroke.of(theme.palette().rule(), 0.35)) + .cornerRadius(4); + addSkills(rail, SectionLookup.firstMatching(sections, SKILL_KEYS)); + addEducation(rail, SectionLookup.firstMatching(sections, EDUCATION_KEYS)); + addAdditional(rail, SectionLookup.firstMatching(sections, ADDITIONAL_KEYS)); + } + + private void addMain(SectionBuilder main, List sections) { + main.spacing(9); + addExperience(main, SectionLookup.firstMatching(sections, EXPERIENCE_KEYS)); + addProjects(main, SectionLookup.firstMatching(sections, PROJECT_KEYS)); } - SectionModule.upperRule(parent, "CvV2NordicCleanSkills", "Skills", - theme, sectionTitleStyle(), options.accentColor(), 82, - host -> { - for (SkillGroup group : skills.groups()) { - addLabelValueLine(host, group.category(), - group.skillsInline(), 7.15, 1.05); + private void addSkills(SectionBuilder parent, CvSection section) { + if (!(section instanceof SkillsSection skills) + || skills.groups().isEmpty()) { + return; } - }); - } - private void addEducation(SectionBuilder parent, CvSection section) { - if (!(section instanceof EntriesSection education) - || education.entries().isEmpty()) { - return; + SectionModule.upperRule(parent, "CvV2NordicCleanSkills", "Skills", + theme, sectionTitleStyle(), options.accentColor(), 82, + host -> { + for (SkillGroup group : skills.groups()) { + addLabelValueLine(host, group.category(), + group.skillsInline(), 7.15, 1.05); + } + }); } - SectionModule.upperRule(parent, "CvV2NordicCleanEducation", - "Education", theme, sectionTitleStyle(), - options.accentColor(), 82, host -> { - for (CvEntry entry : education.entries()) { - EntryCompactRenderer.slashSubtitleDate(host, entry, - CvTextStyles.of(theme.typography().bodyFont(), 7.05, - DocumentTextDecoration.BOLD, - theme.palette().ink()), - bodyStyle(7.05, theme.palette().muted()), - bodyStyle(6.85, theme.palette().muted()), - 1.05, DocumentInsets.bottom(2)); + private void addEducation(SectionBuilder parent, CvSection section) { + if (!(section instanceof EntriesSection education) + || education.entries().isEmpty()) { + return; } - }); - } - private void addAdditional(SectionBuilder parent, CvSection section) { - if (!(section instanceof RowsSection rows) || rows.rows().isEmpty()) { - return; + SectionModule.upperRule(parent, "CvV2NordicCleanEducation", + "Education", theme, sectionTitleStyle(), + options.accentColor(), 82, host -> { + for (CvEntry entry : education.entries()) { + EntryCompactRenderer.slashSubtitleDate(host, entry, + CvTextStyles.of(theme.typography().bodyFont(), 7.05, + DocumentTextDecoration.BOLD, + theme.palette().ink()), + bodyStyle(7.05, theme.palette().muted()), + bodyStyle(6.85, theme.palette().muted()), + 1.05, DocumentInsets.bottom(2)); + } + }); } - SectionModule.upperRule(parent, "CvV2NordicCleanAdditional", - "Additional", theme, sectionTitleStyle(), - options.accentColor(), 82, host -> { - for (CvRow row : rows.rows()) { - addLabelValueLine(host, row.label(), row.body(), - 7.1, 1.05); + private void addAdditional(SectionBuilder parent, CvSection section) { + if (!(section instanceof RowsSection rows) || rows.rows().isEmpty()) { + return; } - }); - } - private void addExperience(SectionBuilder parent, CvSection section) { - if (!(section instanceof EntriesSection entries) - || entries.entries().isEmpty()) { - return; + SectionModule.upperRule(parent, "CvV2NordicCleanAdditional", + "Additional", theme, sectionTitleStyle(), + options.accentColor(), 82, host -> { + for (CvRow row : rows.rows()) { + addLabelValueLine(host, row.label(), row.body(), + 7.1, 1.05); + } + }); } - SectionModule.upperRule(parent, "CvV2NordicCleanExperience", - "Experience", theme, sectionTitleStyle(), - options.accentColor(), 130, host -> { - for (CvEntry entry : entries.entries()) { - addWorkEntry(host, entry); + private void addExperience(SectionBuilder parent, CvSection section) { + if (!(section instanceof EntriesSection entries) + || entries.entries().isEmpty()) { + return; } - }); - } - private void addProjects(SectionBuilder parent, CvSection section) { - if (!(section instanceof RowsSection projects) - || projects.rows().isEmpty()) { - return; + SectionModule.upperRule(parent, "CvV2NordicCleanExperience", + "Experience", theme, sectionTitleStyle(), + options.accentColor(), 130, host -> { + for (CvEntry entry : entries.entries()) { + addWorkEntry(host, entry); + } + }); } - SectionModule.upperRule(parent, "CvV2NordicCleanProjects", - "Selected Projects", theme, sectionTitleStyle(), - options.accentColor(), 130, host -> { - for (CvRow row : projects.rows()) { - addProject(host, row); + private void addProjects(SectionBuilder parent, CvSection section) { + if (!(section instanceof RowsSection projects) + || projects.rows().isEmpty()) { + return; } - }); - } - private void addWorkEntry(SectionBuilder host, CvEntry entry) { - EntryCompactRenderer.titleDateBody(host, entry, - theme.entryTitleStyle(), - CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeEntryDate(), - DocumentTextDecoration.BOLD, - options.accentColor()), - theme.entrySubtitleStyle(), - theme.bodyStyle(), - " / ", - 1.0, - DocumentInsets.zero(), - DocumentInsets.zero(), - DocumentInsets.bottom(5), - theme.typography().bodyLineSpacing(), - false); - } + SectionModule.upperRule(parent, "CvV2NordicCleanProjects", + "Selected Projects", theme, sectionTitleStyle(), + options.accentColor(), 130, host -> { + for (CvRow row : projects.rows()) { + addProject(host, row); + } + }); + } - private void addProject(SectionBuilder host, CvRow row) { - ProjectRenderer.inline(host, row, - CvTextStyles.of(theme.typography().bodyFont(), 7.35, - DocumentTextDecoration.BOLD, theme.palette().ink()), - bodyStyle(6.95, theme.palette().muted()), - bodyStyle(7.2, theme.palette().ink()), - 1.08, DocumentInsets.bottom(3)); - } + private void addWorkEntry(SectionBuilder host, CvEntry entry) { + EntryCompactRenderer.titleDateBody(host, entry, + theme.entryTitleStyle(), + CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntryDate(), + DocumentTextDecoration.BOLD, + options.accentColor()), + theme.entrySubtitleStyle(), + theme.bodyStyle(), + " / ", + 1.0, + DocumentInsets.zero(), + DocumentInsets.zero(), + DocumentInsets.bottom(5), + theme.typography().bodyLineSpacing(), + false); + } - private void addLabelValueLine(SectionBuilder host, String label, - String value, double size, - double lineSpacing) { - DocumentTextStyle labelStyle = CvTextStyles.of(theme.typography().bodyFont(), - size, DocumentTextDecoration.BOLD, theme.palette().ink()); - DocumentTextStyle valueStyle = bodyStyle(size, - theme.palette().muted()); + private void addProject(SectionBuilder host, CvRow row) { + ProjectRenderer.inline(host, row, + CvTextStyles.of(theme.typography().bodyFont(), 7.35, + DocumentTextDecoration.BOLD, theme.palette().ink()), + bodyStyle(6.95, theme.palette().muted()), + bodyStyle(7.2, theme.palette().ink()), + 1.08, DocumentInsets.bottom(3)); + } - LabelValueRenderer.render(host, label, value, labelStyle, - valueStyle, lineSpacing, DocumentInsets.bottom(1.5)); - } + private void addLabelValueLine(SectionBuilder host, String label, + String value, double size, + double lineSpacing) { + DocumentTextStyle labelStyle = CvTextStyles.of(theme.typography().bodyFont(), + size, DocumentTextDecoration.BOLD, theme.palette().ink()); + DocumentTextStyle valueStyle = bodyStyle(size, + theme.palette().muted()); - private DocumentTextStyle headlineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, - theme.palette().ink()); - } + LabelValueRenderer.render(host, label, value, labelStyle, + valueStyle, lineSpacing, DocumentInsets.bottom(1.5)); + } - private DocumentTextStyle sectionTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - options.accentColor()); - } + private DocumentTextStyle headlineStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, + theme.palette().ink()); + } - private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().muted()); - } + private DocumentTextStyle sectionTitleStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + options.accentColor()); + } - private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - options.accentColor()); - } + private DocumentTextStyle contactMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().muted()); + } - private DocumentTextStyle bodyStyle(double size, DocumentColor color) { - return CvTextStyles.of(theme.typography().bodyFont(), size, - DocumentTextDecoration.DEFAULT, color); + private DocumentTextStyle contactLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + options.accentColor()); + } + + private DocumentTextStyle bodyStyle(double size, DocumentColor color) { + return CvTextStyles.of(theme.typography().bodyFont(), size, + DocumentTextDecoration.DEFAULT, color); + } } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java index a424b343a..395feca93 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java @@ -5,29 +5,10 @@ import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.DocumentLinkOptions; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.EntryCompactRenderer; -import com.demcha.compose.document.templates.cv.v2.components.ParagraphRenderer; -import com.demcha.compose.document.templates.cv.v2.components.RowRenderer; -import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.SkillsRenderer; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvLink; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.components.*; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.widgets.CardWidget; import com.demcha.compose.font.FontName; @@ -35,7 +16,6 @@ import java.util.List; import java.util.Locale; import java.util.Objects; -import java.util.function.Consumer; /** * v2 port of the legacy "Panel" CV preset. @@ -73,27 +53,41 @@ */ public final class Panel { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "panel"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Panel"; - /** Recommended page margin (in points) — matches V1 ProductLeader. */ + /** + * Recommended page margin (in points) — matches V1 ProductLeader. + */ public static final double RECOMMENDED_MARGIN = 18.0; - /** V1 ProductLeader deep navy used for the masthead text. */ + /** + * V1 ProductLeader deep navy used for the masthead text. + */ private static final DocumentColor HEADER_TEXT = DocumentColor.rgb(20, 44, 66); - /** V1 ProductLeader teal accent used for module titles + links. */ + /** + * V1 ProductLeader teal accent used for module titles + links. + */ private static final DocumentColor ACCENT = DocumentColor.rgb(0, 128, 128); - /** V1 ProductLeader white panel fill. */ + /** + * V1 ProductLeader white panel fill. + */ private static final DocumentColor PANEL_FILL = DocumentColor.WHITE; - /** Width of the accent strip drawn under each module title. */ + /** + * Width of the accent strip drawn under each module title. + */ private static final double ACCENT_STRIP_WIDTH = 54.0; /** @@ -141,373 +135,367 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } - - @Override - public String id() { - return ID; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String displayName() { - return DISPLAY_NAME; - } + public String id() { + return ID; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - // Pre-compute card widths so every panel renders at an - // identical outer width regardless of content. Sections in - // the v2 engine fit content min-width by default, so the - // longest line in (say) Skills would otherwise push that - // card wider than Education or Additional. The widthAnchor - // spacer below pins each card's content area to the - // pre-computed target. - double innerWidth = document.canvas().innerWidth(); - double gap = theme.spacing().pageFlowSpacing(); - double cardPadding = theme.spacing().bannerInnerPadding(); - double fullCardContentWidth = innerWidth - 2 * cardPadding; - double sideCardContentWidth = - (innerWidth - gap) / 2 - 2 * cardPadding; - - List sections = doc.sectionsIn(Slot.MAIN); - PageFlowBuilder flow = document.dsl() - .pageFlow() - .name("CvV2PanelRoot") - .spacing(gap); - - CvSection summary = SectionLookup.firstMatching(sections, SUMMARY_KEYS); - CvSection skills = SectionLookup.firstMatching(sections, SKILL_KEYS); - CvSection education = SectionLookup.firstMatching(sections, EDUCATION_KEYS); - CvSection experience = SectionLookup.firstMatching(sections, EXPERIENCE_KEYS); - CvSection projects = SectionLookup.firstMatching(sections, PROJECT_KEYS); - CvSection additional = SectionLookup.firstMatching(sections, ADDITIONAL_KEYS); - - addHeader(flow, doc.identity(), fullCardContentWidth); - addFullWidthPanel(flow, "Profile", "Profile", summary, - fullCardContentWidth); - - // Left column = three separate cards (Skills, Education, - // Additional). Right column = two separate cards (Experience, - // Projects). Every card is anchored to sideCardContentWidth - // so all panels in each column are visually identical width. - boolean leftHasContent = hasContent(skills) || hasContent(education) - || hasContent(additional); - boolean rightHasContent = hasContent(experience) || hasContent(projects); - if (leftHasContent || rightHasContent) { - flow.addRow("CvV2PanelStacked", row -> row - .spacing(gap) - .weights(1.0, 1.0) - .addSection("CvV2PanelStackedLeft", left -> { - left.spacing(gap); - addSidePanel(left, "Skills", "Skills", - skills, sideCardContentWidth); - addSidePanel(left, "Education", "Education", - education, sideCardContentWidth); - addSidePanel(left, "Additional", "Additional", - additional, sideCardContentWidth); - }) - .addSection("CvV2PanelStackedRight", right -> { - right.spacing(gap); - addSidePanel(right, "Experience", "Experience", - experience, sideCardContentWidth); - addSidePanel(right, "Projects", "Projects", - projects, sideCardContentWidth); - })); + @Override + public String displayName() { + return DISPLAY_NAME; } - flow.build(); - } + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + // Pre-compute card widths so every panel renders at an + // identical outer width regardless of content. Sections in + // the v2 engine fit content min-width by default, so the + // longest line in (say) Skills would otherwise push that + // card wider than Education or Additional. The widthAnchor + // spacer below pins each card's content area to the + // pre-computed target. + double innerWidth = document.canvas().innerWidth(); + double gap = theme.spacing().pageFlowSpacing(); + double cardPadding = theme.spacing().bannerInnerPadding(); + double fullCardContentWidth = innerWidth - 2 * cardPadding; + double sideCardContentWidth = + (innerWidth - gap) / 2 - 2 * cardPadding; + + List sections = doc.sectionsIn(Slot.MAIN); + PageFlowBuilder flow = document.dsl() + .pageFlow() + .name("CvV2PanelRoot") + .spacing(gap); + + CvSection summary = SectionLookup.firstMatching(sections, SUMMARY_KEYS); + CvSection skills = SectionLookup.firstMatching(sections, SKILL_KEYS); + CvSection education = SectionLookup.firstMatching(sections, EDUCATION_KEYS); + CvSection experience = SectionLookup.firstMatching(sections, EXPERIENCE_KEYS); + CvSection projects = SectionLookup.firstMatching(sections, PROJECT_KEYS); + CvSection additional = SectionLookup.firstMatching(sections, ADDITIONAL_KEYS); + + addHeader(flow, doc.identity(), fullCardContentWidth); + addFullWidthPanel(flow, "Profile", "Profile", summary, + fullCardContentWidth); + + // Left column = three separate cards (Skills, Education, + // Additional). Right column = two separate cards (Experience, + // Projects). Every card is anchored to sideCardContentWidth + // so all panels in each column are visually identical width. + boolean leftHasContent = hasContent(skills) || hasContent(education) + || hasContent(additional); + boolean rightHasContent = hasContent(experience) || hasContent(projects); + if (leftHasContent || rightHasContent) { + flow.addRow("CvV2PanelStacked", row -> row + .spacing(gap) + .weights(1.0, 1.0) + .addSection("CvV2PanelStackedLeft", left -> { + left.spacing(gap); + addSidePanel(left, "Skills", "Skills", + skills, sideCardContentWidth); + addSidePanel(left, "Education", "Education", + education, sideCardContentWidth); + addSidePanel(left, "Additional", "Additional", + additional, sideCardContentWidth); + }) + .addSection("CvV2PanelStackedRight", right -> { + right.spacing(gap); + addSidePanel(right, "Experience", "Experience", + experience, sideCardContentWidth); + addSidePanel(right, "Projects", "Projects", + projects, sideCardContentWidth); + })); + } - private void addHeader(PageFlowBuilder flow, CvIdentity identity, - double anchorWidth) { - CardWidget.render(flow, "CvV2PanelHeader", - headerStyle(), - card -> { - widthAnchor(card, anchorWidth); - // Inline the name paragraph instead of going through - // Headline.uppercaseCentered — that widget calls - // host.padding(theme.spacing.headlinePadding()) which - // overrides the card's padding set by CardWidget, - // making the header outline visibly wider than the - // panel cards below it. - card.addParagraph(paragraph -> paragraph - .text(identity.name().full() - .toUpperCase(Locale.ROOT)) - .textStyle(nameStyle()) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero())); - if (!identity.jobTitle().isBlank()) { - card.addParagraph(paragraph -> paragraph - .text(identity.jobTitle()) - .textStyle(headerBodyStyle()) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero())); - } - String contact = joinPipe(identity.contact().address(), - identity.contact().phone()); - if (!contact.isBlank()) { + flow.build(); + } + + private void addHeader(PageFlowBuilder flow, CvIdentity identity, + double anchorWidth) { + CardWidget.render(flow, "CvV2PanelHeader", + headerStyle(), + card -> { + widthAnchor(card, anchorWidth); + // Inline the name paragraph instead of going through + // Headline.uppercaseCentered — that widget calls + // host.padding(theme.spacing.headlinePadding()) which + // overrides the card's padding set by CardWidget, + // making the header outline visibly wider than the + // panel cards below it. card.addParagraph(paragraph -> paragraph - .text(contact) - .textStyle(headerMetaStyle()) + .text(identity.name().full() + .toUpperCase(Locale.ROOT)) + .textStyle(nameStyle()) .align(TextAlign.CENTER) .margin(DocumentInsets.zero())); - } - addLinkRow(card, identity); - }); - } - - private void addLinkRow(SectionBuilder section, CvIdentity identity) { - boolean hasEmail = !identity.contact().email().isBlank(); - boolean hasLinks = !identity.links().isEmpty(); - if (!hasEmail && !hasLinks) { - return; - } - DocumentTextStyle bodyStyle = headerMetaStyle(); - DocumentTextStyle linkStyle = headerLinkStyle(); - section.addParagraph(paragraph -> paragraph - .textStyle(bodyStyle) - .align(TextAlign.CENTER) - .margin(DocumentInsets.zero()) - .rich(rich -> { - boolean first = true; - String email = identity.contact().email(); - if (!email.isBlank()) { - rich.with(email, linkStyle, - new DocumentLinkOptions("mailto:" + email)); - first = false; - } - for (CvLink link : identity.links()) { - if (link.label().isBlank()) { - continue; + if (!identity.jobTitle().isBlank()) { + card.addParagraph(paragraph -> paragraph + .text(identity.jobTitle()) + .textStyle(headerBodyStyle()) + .align(TextAlign.CENTER) + .margin(DocumentInsets.zero())); } - if (!first) { - rich.style(" | ", bodyStyle); + String contact = joinPipe(identity.contact().address(), + identity.contact().phone()); + if (!contact.isBlank()) { + card.addParagraph(paragraph -> paragraph + .text(contact) + .textStyle(headerMetaStyle()) + .align(TextAlign.CENTER) + .margin(DocumentInsets.zero())); } - first = false; - if (link.url().isBlank()) { - rich.style(link.label(), bodyStyle); - } else { - rich.with(link.label(), linkStyle, - new DocumentLinkOptions(link.url())); + addLinkRow(card, identity); + }); + } + + private void addLinkRow(SectionBuilder section, CvIdentity identity) { + boolean hasEmail = !identity.contact().email().isBlank(); + boolean hasLinks = !identity.links().isEmpty(); + if (!hasEmail && !hasLinks) { + return; + } + DocumentTextStyle bodyStyle = headerMetaStyle(); + DocumentTextStyle linkStyle = headerLinkStyle(); + section.addParagraph(paragraph -> paragraph + .textStyle(bodyStyle) + .align(TextAlign.CENTER) + .margin(DocumentInsets.zero()) + .rich(rich -> { + boolean first = true; + String email = identity.contact().email(); + if (!email.isBlank()) { + rich.with(email, linkStyle, + new DocumentLinkOptions("mailto:" + email)); + first = false; } - } - })); - } + for (CvLink link : identity.links()) { + if (link.label().isBlank()) { + continue; + } + if (!first) { + rich.style(" | ", bodyStyle); + } + first = false; + if (link.url().isBlank()) { + rich.style(link.label(), bodyStyle); + } else { + rich.with(link.label(), linkStyle, + new DocumentLinkOptions(link.url())); + } + } + })); + } - /** - * Renders a full-width top-level card (Profile). Shares the - * exact same shell as {@link #addSidePanel} and - * {@link #headerStyle} so every panel on the page draws with - * the same outline width and corner radius. - */ - private void addFullWidthPanel(PageFlowBuilder flow, String name, - String title, CvSection section, - double anchorWidth) { - if (!hasContent(section)) { - return; + /** + * Renders a full-width top-level card (Profile). Shares the + * exact same shell as {@link #addSidePanel} and + * {@link #headerStyle} so every panel on the page draws with + * the same outline width and corner radius. + */ + private void addFullWidthPanel(PageFlowBuilder flow, String name, + String title, CvSection section, + double anchorWidth) { + if (!hasContent(section)) { + return; + } + CardWidget.render(flow, "CvV2Panel" + name + "Card", + panelStyle(), + card -> { + widthAnchor(card, anchorWidth); + renderModuleBody(card, title, section); + }); } - CardWidget.render(flow, "CvV2Panel" + name + "Card", - panelStyle(), - card -> { - widthAnchor(card, anchorWidth); - renderModuleBody(card, title, section); - }); - } - /** - * Renders one panel card inside a left/right column section. - * Each section in a side column gets its own card so the - * column reads as a stack of separately-bordered panels of - * identical width but varying height. - */ - private void addSidePanel(SectionBuilder column, String name, - String title, CvSection section, - double anchorWidth) { - if (!hasContent(section)) { - return; + /** + * Renders one panel card inside a left/right column section. + * Each section in a side column gets its own card so the + * column reads as a stack of separately-bordered panels of + * identical width but varying height. + */ + private void addSidePanel(SectionBuilder column, String name, + String title, CvSection section, + double anchorWidth) { + if (!hasContent(section)) { + return; + } + CardWidget.render(column, "CvV2Panel" + name + "Card", + panelStyle(), + card -> { + widthAnchor(card, anchorWidth); + renderModuleBody(card, title, section); + }); } - CardWidget.render(column, "CvV2Panel" + name + "Card", - panelStyle(), - card -> { - widthAnchor(card, anchorWidth); - renderModuleBody(card, title, section); - }); - } - /** - * Anchors a card's content min-width to the given target. Sections - * in the v2 engine default to fit-content widths inside columns; - * adding a zero-height spacer of the exact target width forces the - * card's content area to that width so every panel renders at the - * same outer width regardless of how long its longest paragraph is. - */ - private void widthAnchor(SectionBuilder card, double width) { - card.spacer(width, 0.0); - } + /** + * Anchors a card's content min-width to the given target. Sections + * in the v2 engine default to fit-content widths inside columns; + * adding a zero-height spacer of the exact target width forces the + * card's content area to that width so every panel renders at the + * same outer width regardless of how long its longest paragraph is. + */ + private void widthAnchor(SectionBuilder card, double width) { + card.spacer(width, 0.0); + } - private static boolean hasContent(CvSection section) { - return section != null && SectionLookup.hasContent(section); - } + private static boolean hasContent(CvSection section) { + return SectionLookup.hasContent(section); + } - private void renderModuleBody(SectionBuilder card, String title, - CvSection section) { - card.addParagraph(paragraph -> paragraph - .text(title.toUpperCase(Locale.ROOT)) - .textStyle(moduleTitleStyle()) - .align(TextAlign.LEFT) - .margin(DocumentInsets.zero())) - .addShape(shape -> shape - .name("CvV2PanelAccent_" - + SectionLookup.normalize(title)) - .size(ACCENT_STRIP_WIDTH, - theme.spacing().accentRuleWidth()) - .fillColor(ACCENT) - .cornerRadius( - theme.spacing().accentRuleWidth() / 2.0) - .margin(DocumentInsets.zero())); - renderCardBody(card, section); - } + private void renderModuleBody(SectionBuilder card, String title, + CvSection section) { + card.addParagraph(paragraph -> paragraph + .text(title.toUpperCase(Locale.ROOT)) + .textStyle(moduleTitleStyle()) + .align(TextAlign.LEFT) + .margin(DocumentInsets.zero())) + .addShape(shape -> shape + .name("CvV2PanelAccent_" + + SectionLookup.normalize(title)) + .size(ACCENT_STRIP_WIDTH, + theme.spacing().accentRuleWidth()) + .fillColor(ACCENT) + .cornerRadius( + theme.spacing().accentRuleWidth() / 2.0) + .margin(DocumentInsets.zero())); + renderCardBody(card, section); + } - /** - * Preset-local body dispatcher. Functionally equivalent to - * {@link com.demcha.compose.document.templates.cv.v2.components.SectionDispatcher} - * except that {@link EntriesSection} entries are drawn through - * {@link EntryCompactRenderer#titleDateBody} (single-paragraph - * "title - date" header) instead of the standard - * {@code EntryRenderer}'s two-column Row header. The engine - * bans nested horizontal rows; since every Panel module card - * may sit inside the page-level 2-column {@code flow.addRow}, - * the entry header must stay row-free here. - */ - private void renderCardBody(SectionBuilder card, CvSection section) { - if (section instanceof ParagraphSection paragraph) { - ParagraphRenderer.render(card, paragraph.body(), theme); - } else if (section instanceof SkillsSection skills) { - SkillsRenderer.render(card, skills, theme); - } else if (section instanceof RowsSection rows) { - boolean stackedNeedsSeparator = - rows.style() == RowStyle.BULLETED_STACKED; - for (int i = 0; i < rows.rows().size(); i++) { - if (i > 0 && stackedNeedsSeparator) { - card.spacer(0, theme.spacing().entrySeparation()); + /** + * Preset-local body dispatcher. Functionally equivalent to + * {@link SectionDispatcher} + * except that {@link EntriesSection} entries are drawn through + * {@link EntryCompactRenderer#titleDateBody} (single-paragraph + * "title - date" header) instead of the standard + * {@code EntryRenderer}'s two-column Row header. The engine + * bans nested horizontal rows; since every Panel module card + * may sit inside the page-level 2-column {@code flow.addRow}, + * the entry header must stay row-free here. + */ + private void renderCardBody(SectionBuilder card, CvSection section) { + if (section instanceof ParagraphSection paragraph) { + ParagraphRenderer.render(card, paragraph.body(), theme); + } else if (section instanceof SkillsSection skills) { + SkillsRenderer.render(card, skills, theme); + } else if (section instanceof RowsSection rows) { + boolean stackedNeedsSeparator = + rows.style() == RowStyle.BULLETED_STACKED; + for (int i = 0; i < rows.rows().size(); i++) { + if (i > 0 && stackedNeedsSeparator) { + card.spacer(0, theme.spacing().entrySeparation()); + } + RowRenderer.render(card, rows.rows().get(i), + rows.style(), theme); } - RowRenderer.render(card, rows.rows().get(i), - rows.style(), theme); - } - } else if (section instanceof EntriesSection entries) { - for (int i = 0; i < entries.entries().size(); i++) { - if (i > 0) { - card.spacer(0, theme.spacing().entrySeparation()); + } else if (section instanceof EntriesSection entries) { + for (int i = 0; i < entries.entries().size(); i++) { + if (i > 0) { + card.spacer(0, theme.spacing().entrySeparation()); + } + CvEntry entry = entries.entries().get(i); + EntryCompactRenderer.titleDateBody(card, entry, + theme.entryTitleStyle(), + theme.entryDateStyle(), + theme.entrySubtitleStyle(), + theme.bodyStyle(), + " - ", + 1.0, + DocumentInsets.zero(), + DocumentInsets.zero(), + DocumentInsets.top(theme.spacing().paragraphMarginTop()), + theme.typography().bodyLineSpacing(), + false); } - CvEntry entry = entries.entries().get(i); - EntryCompactRenderer.titleDateBody(card, entry, - theme.entryTitleStyle(), - theme.entryDateStyle(), - theme.entrySubtitleStyle(), - theme.bodyStyle(), - " - ", - 1.0, - DocumentInsets.zero(), - DocumentInsets.zero(), - DocumentInsets.top(theme.spacing().paragraphMarginTop()), - theme.typography().bodyLineSpacing(), - false); } } - } - /** - * Shared shell for every module card (Profile, Skills, - * Education, Additional, Experience, Projects). White fill, - * the same stroke/corner as the header, and the - * {@code bannerInnerPadding} the theme exposes. - */ - private CardWidget.Style panelStyle() { - return CardWidget.Style.builder() - .spacing(theme.spacing().sectionBodySpacing()) - .padding(DocumentInsets.of( - theme.spacing().bannerInnerPadding())) - .fillColor(PANEL_FILL) - .stroke(DocumentStroke.of(theme.palette().rule(), - PANEL_STROKE_THICKNESS)) - .cornerRadius(theme.spacing().bannerCornerRadius()) - .build(); - } + /** + * Shared shell for every module card (Profile, Skills, + * Education, Additional, Experience, Projects). White fill, + * the same stroke/corner as the header, and the + * {@code bannerInnerPadding} the theme exposes. + */ + private CardWidget.Style panelStyle() { + return CardWidget.Style.builder() + .spacing(theme.spacing().sectionBodySpacing()) + .padding(DocumentInsets.of( + theme.spacing().bannerInnerPadding())) + .fillColor(PANEL_FILL) + .stroke(DocumentStroke.of(theme.palette().rule(), + PANEL_STROKE_THICKNESS)) + .cornerRadius(theme.spacing().bannerCornerRadius()) + .build(); + } - /** - * Header card shell. Same outline (stroke, padding, corner) as - * {@link #panelStyle()} — only the fill is tinted teal so the - * masthead reads as a distinct band while still being visually - * the same width as every other panel below it. - */ - private CardWidget.Style headerStyle() { - return CardWidget.Style.builder() - .spacing(4) - .padding(DocumentInsets.of( - theme.spacing().bannerInnerPadding())) - .fillColor(theme.palette().banner()) - .stroke(DocumentStroke.of(theme.palette().rule(), - PANEL_STROKE_THICKNESS)) - .cornerRadius(theme.spacing().bannerCornerRadius()) - .build(); - } + /** + * Header card shell. Same outline (stroke, padding, corner) as + * {@link #panelStyle()} — only the fill is tinted teal so the + * masthead reads as a distinct band while still being visually + * the same width as every other panel below it. + */ + private CardWidget.Style headerStyle() { + return CardWidget.Style.builder() + .spacing(4) + .padding(DocumentInsets.of( + theme.spacing().bannerInnerPadding())) + .fillColor(theme.palette().banner()) + .stroke(DocumentStroke.of(theme.palette().rule(), + PANEL_STROKE_THICKNESS)) + .cornerRadius(theme.spacing().bannerCornerRadius()) + .build(); + } - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, - theme.typography().sizeHeadline(), - DocumentTextDecoration.BOLD, - HEADER_TEXT); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(FontName.POPPINS, + theme.typography().sizeHeadline(), + DocumentTextDecoration.BOLD, + HEADER_TEXT); + } - private DocumentTextStyle headerBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle headerBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle headerMetaStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.UNDERLINE, - ACCENT); - } + private DocumentTextStyle headerLinkStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.UNDERLINE, + ACCENT); + } - private DocumentTextStyle moduleTitleStyle() { - return CvTextStyles.of(FontName.POPPINS, - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - ACCENT); - } + private DocumentTextStyle moduleTitleStyle() { + return CvTextStyles.of(FontName.POPPINS, + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + ACCENT); + } - private static String joinPipe(String... parts) { - StringBuilder sb = new StringBuilder(); - for (String part : parts) { - if (part == null || part.isBlank()) { - continue; - } - if (sb.length() > 0) { - sb.append(" | "); + private static String joinPipe(String... parts) { + StringBuilder sb = new StringBuilder(); + for (String part : parts) { + if (part == null || part.isBlank()) { + continue; + } + if (sb.length() > 0) { + sb.append(" | "); + } + sb.append(part.trim()); } - sb.append(part.trim()); + return sb.toString(); } - return sb.toString(); } - } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java index f52515453..be4e6f5bd 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java @@ -16,28 +16,13 @@ import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.ProjectLabel; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvLink; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** @@ -61,19 +46,29 @@ */ public final class SidebarPortrait { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "sidebar-portrait"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Sidebar Portrait"; - /** Recommended page margin (in points) — 0 so the sidebar bleeds to the edge. */ + /** + * Recommended page margin (in points) — 0 so the sidebar bleeds to the edge. + */ public static final double RECOMMENDED_MARGIN = 0.0; - /** Ratio of the page width allocated to the left sidebar column. */ + /** + * Ratio of the page width allocated to the left sidebar column. + */ private static final double SIDEBAR_WIDTH_RATIO = 0.34; - /** V1 default mid-grey accent used for the divider rule under sidebar headings. */ + /** + * V1 default mid-grey accent used for the divider rule under sidebar headings. + */ private static final DocumentColor DEFAULT_ACCENT = DocumentColor.rgb(106, 106, 106); @@ -871,7 +866,7 @@ private DocumentTextStyle mainProjectContextStyle() { // -- Static helpers ---------------------------------------------------- private static boolean hasContent(CvSection section) { - return section != null && SectionLookup.hasContent(section); + return SectionLookup.hasContent(section); } private static List contactItems(CvIdentity identity) { @@ -992,7 +987,7 @@ private static List languageItems(CvSection section) { } } } else if (!label.isBlank() - && (body.contains("(") || body.contains("|"))) { + && (body.contains("(") || body.contains("|"))) { result.add(label + " " + body); } } @@ -1017,8 +1012,8 @@ private static String spacedUpper(String value) { char current = upper.charAt(i); builder.append(current); if (Character.isLetterOrDigit(current) - && i + 1 < upper.length() - && Character.isLetterOrDigit(upper.charAt(i + 1))) { + && i + 1 < upper.length() + && Character.isLetterOrDigit(upper.charAt(i + 1))) { builder.append(' '); } else if (Character.isWhitespace(current)) { builder.append(" "); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java index 4ca981ee4..64e40e7b2 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java @@ -15,29 +15,14 @@ import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.data.CvDocument; -import com.demcha.compose.document.templates.cv.v2.data.CvEntry; -import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; -import com.demcha.compose.document.templates.cv.v2.data.CvLink; -import com.demcha.compose.document.templates.cv.v2.data.CvRow; -import com.demcha.compose.document.templates.cv.v2.data.CvSection; -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.RowsSection; -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.v2.data.Slot; +import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.cv.v2.theme.CvTheme; import com.demcha.compose.document.templates.widgets.TimelineAxisWidget; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** @@ -60,31 +45,49 @@ */ public final class TimelineMinimal { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "timeline-minimal"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Timeline Minimal"; - /** Recommended page margin (in points) — matches V1 TimelineMinimal. */ + /** + * Recommended page margin (in points) — matches V1 TimelineMinimal. + */ public static final double RECOMMENDED_MARGIN = 22.0; - /** Diameter of each timeline marker; 4 segments + 3 markers by default. */ + /** + * Diameter of each timeline marker; 4 segments + 3 markers by default. + */ private static final double TIMELINE_DOT = 7.0; - /** Default total axis height — sized for a one-page CV. */ + /** + * Default total axis height — sized for a one-page CV. + */ private static final double TIMELINE_AXIS_HEIGHT = 620.0; - /** Top inset before the first axis segment starts. */ + /** + * Top inset before the first axis segment starts. + */ private static final double TIMELINE_TOP_PADDING = 28.0; - /** Number of vertical line segments; markers between = segmentCount - 1. */ + /** + * Number of vertical line segments; markers between = segmentCount - 1. + */ private static final int TIMELINE_SEGMENT_COUNT = 4; - /** Stroke thickness of every line segment. */ + /** + * Stroke thickness of every line segment. + */ private static final double TIMELINE_LINE_THICKNESS = 0.75; - /** Stroke thickness of the marker outline. */ + /** + * Stroke thickness of the marker outline. + */ private static final double TIMELINE_MARKER_STROKE = 0.8; private static final double CONTACT_ICON_SIZE = 10.5; @@ -130,345 +133,339 @@ public static DocumentTemplate create(CvTheme theme) { return new Template(theme); } - private static final class Template implements DocumentTemplate { - - private final CvTheme theme; - - Template(CvTheme theme) { - this.theme = theme; - } + private record Template(CvTheme theme) implements DocumentTemplate { @Override - public String id() { - return ID; - } + public String id() { + return ID; + } - @Override - public String displayName() { - return DISPLAY_NAME; - } + @Override + public String displayName() { + return DISPLAY_NAME; + } - @Override - public void compose(DocumentSession document, CvDocument doc) { - Objects.requireNonNull(document, "document"); - Objects.requireNonNull(doc, "doc"); - - double width = document.canvas().innerWidth(); - List sections = doc.sectionsIn(Slot.MAIN); - - document.dsl() - .pageFlow() - .name("CvV2TimelineMinimalRoot") - .spacing(theme.spacing().pageFlowSpacing()) - .addRow("CvV2TimelineMinimalHeader", row -> row - .spacing(3) - .weights(1.00, 0.61) - .addSection("CvV2TimelineMinimalName", - section -> addNameBlock(section, doc.identity())) - .addSection("CvV2TimelineMinimalContact", - section -> addContact(section, doc.identity()))) - .addLine(line -> line - .name("CvV2TimelineMinimalHeaderRule") - .horizontal(width) - .color(theme.palette().rule()) - .thickness(theme.spacing().accentRuleWidth()) - .margin(DocumentInsets.zero())) - .addRow("CvV2TimelineMinimalBody", row -> addBodyRow(row, - List.of( - new ModulePlacement("Education", - SectionLookup.firstMatching(sections, - EDUCATION_KEYS), - 5), - new ModulePlacement("Skills", - SectionLookup.firstMatching(sections, - SKILL_KEYS), - 6), - new ModulePlacement("Expertise", - SectionLookup.firstMatching(sections, - PROJECT_KEYS), - 3), - new ModulePlacement("Languages", - SectionLookup.firstMatching(sections, - ADDITIONAL_KEYS), - 3)), - List.of( - new ModulePlacement("Professional Profile", - SectionLookup.firstMatching(sections, - SUMMARY_KEYS), - 1), - new ModulePlacement("Work Experience", - SectionLookup.firstMatching(sections, - EXPERIENCE_KEYS), - 4)), - TIMELINE_AXIS_HEIGHT)) - .build(); - } + @Override + public void compose(DocumentSession document, CvDocument doc) { + Objects.requireNonNull(document, "document"); + Objects.requireNonNull(doc, "doc"); + + double width = document.canvas().innerWidth(); + List sections = doc.sectionsIn(Slot.MAIN); + + document.dsl() + .pageFlow() + .name("CvV2TimelineMinimalRoot") + .spacing(theme.spacing().pageFlowSpacing()) + .addRow("CvV2TimelineMinimalHeader", row -> row + .spacing(3) + .weights(1.00, 0.61) + .addSection("CvV2TimelineMinimalName", + section -> addNameBlock(section, doc.identity())) + .addSection("CvV2TimelineMinimalContact", + section -> addContact(section, doc.identity()))) + .addLine(line -> line + .name("CvV2TimelineMinimalHeaderRule") + .horizontal(width) + .color(theme.palette().rule()) + .thickness(theme.spacing().accentRuleWidth()) + .margin(DocumentInsets.zero())) + .addRow("CvV2TimelineMinimalBody", row -> addBodyRow(row, + List.of( + new ModulePlacement("Education", + SectionLookup.firstMatching(sections, + EDUCATION_KEYS), + 5), + new ModulePlacement("Skills", + SectionLookup.firstMatching(sections, + SKILL_KEYS), + 6), + new ModulePlacement("Expertise", + SectionLookup.firstMatching(sections, + PROJECT_KEYS), + 3), + new ModulePlacement("Languages", + SectionLookup.firstMatching(sections, + ADDITIONAL_KEYS), + 3)), + List.of( + new ModulePlacement("Professional Profile", + SectionLookup.firstMatching(sections, + SUMMARY_KEYS), + 1), + new ModulePlacement("Work Experience", + SectionLookup.firstMatching(sections, + EXPERIENCE_KEYS), + 4)), + TIMELINE_AXIS_HEIGHT)) + .build(); + } - private void addNameBlock(SectionBuilder section, CvIdentity identity) { - section.spacing(4) - .addParagraph(paragraph -> paragraph - .text(spacedUpper(identity.name().full())) - .textStyle(nameStyle()) + private void addNameBlock(SectionBuilder section, CvIdentity identity) { + section.spacing(4) + .addParagraph(paragraph -> paragraph + .text(spacedUpper(identity.name().full())) + .textStyle(nameStyle()) + .margin(DocumentInsets.zero())); + String jobTitle = identity.jobTitle(); + if (!jobTitle.isBlank()) { + section.addParagraph(paragraph -> paragraph + .text(jobTitle.toUpperCase(Locale.ROOT)) + .textStyle(jobTitleStyle()) .margin(DocumentInsets.zero())); - String jobTitle = identity.jobTitle(); - if (!jobTitle.isBlank()) { - section.addParagraph(paragraph -> paragraph - .text(jobTitle.toUpperCase(Locale.ROOT)) - .textStyle(jobTitleStyle()) - .margin(DocumentInsets.zero())); + } } - } - - private void addBodyRow(RowBuilder row, - List sidebarModules, - List mainModules, - double axisHeight) { - row.spacing(16) - .weights(0.74, 0.12, 1.74) - .addSection("CvV2TimelineMinimalSidebar", sidebar -> { - sidebar.spacing(10); - for (ModulePlacement placement : sidebarModules) { - addSidebarModule(sidebar, placement.title(), - placement.section(), placement.limit()); - } - }) - .addSection("CvV2TimelineMinimalAxis", axis -> - TimelineAxisWidget.render(axis, - timelineAxisStyle(), axisHeight)) - .addSection("CvV2TimelineMinimalMain", main -> { - main.spacing(11); - for (ModulePlacement placement : mainModules) { - boolean bullets = placement.limit() > 1; - addMainModule(main, placement.title(), - placement.section(), bullets, placement.limit()); - } - }); - } - private void addContact(SectionBuilder section, CvIdentity identity) { - section.spacing(3); - DocumentTextStyle textStyle = contactTextStyle(); - DocumentTextStyle fallbackIconStyle = fallbackIconStyle(); - for (ContactItem item : contactItems(identity)) { - section.addParagraph(paragraph -> paragraph - .textStyle(textStyle) - .align(TextAlign.RIGHT) - .link(item.linkOptions()) - .margin(DocumentInsets.zero()) - .rich(rich -> { - rich.style(item.text(), textStyle); - rich.plain(" "); - if (item.iconFile() != null) { - rich.image(contactIcon(item.iconFile()), - CONTACT_ICON_SIZE, - CONTACT_ICON_SIZE, - InlineImageAlignment.CENTER, - CONTACT_ICON_BASELINE_OFFSET, - item.linkOptions()); - } else { - rich.style(item.fallbackIcon(), - fallbackIconStyle); + private void addBodyRow(RowBuilder row, + List sidebarModules, + List mainModules, + double axisHeight) { + row.spacing(16) + .weights(0.74, 0.12, 1.74) + .addSection("CvV2TimelineMinimalSidebar", sidebar -> { + sidebar.spacing(10); + for (ModulePlacement placement : sidebarModules) { + addSidebarModule(sidebar, placement.title(), + placement.section(), placement.limit()); + } + }) + .addSection("CvV2TimelineMinimalAxis", axis -> + TimelineAxisWidget.render(axis, + timelineAxisStyle(), axisHeight)) + .addSection("CvV2TimelineMinimalMain", main -> { + main.spacing(11); + for (ModulePlacement placement : mainModules) { + boolean bullets = placement.limit() > 1; + addMainModule(main, placement.title(), + placement.section(), bullets, placement.limit()); } - })); + }); } - } - private List contactItems(CvIdentity identity) { - if (identity == null) { - return List.of(); - } - List items = new ArrayList<>(); - addContactItem(items, "LOC", "location.png", - identity.contact().address(), null); - addContactItem(items, "TEL", "phone.png", - identity.contact().phone(), null); - String email = identity.contact().email(); - if (!email.isBlank()) { - addContactItem(items, "@", "email.png", email, - new DocumentLinkOptions("mailto:" + email)); - } - for (CvLink link : identity.links()) { - String label = link.label(); - if (label.isBlank()) { - continue; + private void addContact(SectionBuilder section, CvIdentity identity) { + section.spacing(3); + DocumentTextStyle textStyle = contactTextStyle(); + DocumentTextStyle fallbackIconStyle = fallbackIconStyle(); + for (ContactItem item : contactItems(identity)) { + section.addParagraph(paragraph -> paragraph + .textStyle(textStyle) + .align(TextAlign.RIGHT) + .link(item.linkOptions()) + .margin(DocumentInsets.zero()) + .rich(rich -> { + rich.style(item.text(), textStyle); + rich.plain(" "); + if (item.iconFile() != null) { + rich.image(contactIcon(item.iconFile()), + CONTACT_ICON_SIZE, + CONTACT_ICON_SIZE, + InlineImageAlignment.CENTER, + CONTACT_ICON_BASELINE_OFFSET, + item.linkOptions()); + } else { + rich.style(item.fallbackIcon(), + fallbackIconStyle); + } + })); } - String url = link.url(); - addContactItem(items, pickFallbackIcon(label), - pickIconFile(label), label, - url.isBlank() - ? null - : new DocumentLinkOptions(url.trim())); } - return List.copyOf(items); - } - private static void addContactItem(List items, - String fallbackIcon, - String iconFile, - String text, - DocumentLinkOptions linkOptions) { - if (text != null && !text.isBlank()) { - items.add(new ContactItem(fallbackIcon, iconFile, text, - linkOptions)); + private List contactItems(CvIdentity identity) { + if (identity == null) { + return List.of(); + } + List items = new ArrayList<>(); + addContactItem(items, "LOC", "location.png", + identity.contact().address(), null); + addContactItem(items, "TEL", "phone.png", + identity.contact().phone(), null); + String email = identity.contact().email(); + if (!email.isBlank()) { + addContactItem(items, "@", "email.png", email, + new DocumentLinkOptions("mailto:" + email)); + } + for (CvLink link : identity.links()) { + String label = link.label(); + if (label.isBlank()) { + continue; + } + String url = link.url(); + addContactItem(items, pickFallbackIcon(label), + pickIconFile(label), label, + url.isBlank() + ? null + : new DocumentLinkOptions(url.trim())); + } + return List.copyOf(items); } - } - - private DocumentImageData contactIcon(String iconFile) { - return DocumentImageData.fromBytes( - CONTACT_ICON_CACHE.computeIfAbsent(iconFile, - TimelineMinimal::readIconBytes)); - } - private void addSidebarModule(SectionBuilder sidebar, String title, - CvSection section, int limit) { - List lines = sectionLines(section); - if (lines.isEmpty()) { - return; - } - sidebar.addSection("CvV2TimelineMinimalSidebar" - + SectionLookup.normalize(title), block -> { - block.spacing(6) - .addParagraph(paragraph -> paragraph - .text(title.toUpperCase(Locale.ROOT)) - .textStyle(sidebarTitleStyle()) - .margin(DocumentInsets.zero())); - for (String line : lines.stream().limit(limit).toList()) { - block.addParagraph(paragraph -> paragraph - .text(excerpt(line, 76)) - .textStyle(sidebarBodyStyle()) - .lineSpacing(1) - .margin(DocumentInsets.zero())); + private static void addContactItem(List items, + String fallbackIcon, + String iconFile, + String text, + DocumentLinkOptions linkOptions) { + if (text != null && !text.isBlank()) { + items.add(new ContactItem(fallbackIcon, iconFile, text, + linkOptions)); } - block.addLine(line -> line - .horizontal(118) - .color(theme.palette().rule()) - .thickness(0.65) - .margin(DocumentInsets.top(5))); - }); - } - - /** - * Style applied to the central timeline axis. Drop a custom - * {@link TimelineAxisWidget.Style} here (or expose it through - * the theme) to swap the marker shape, sizing, or colours. - */ - private TimelineAxisWidget.Style timelineAxisStyle() { - return TimelineAxisWidget.Style.builder() - .marker(TimelineAxisWidget.Marker.CIRCLE) - .markerSize(TIMELINE_DOT) - .markerStroke(DocumentStroke.of( - theme.palette().banner(), - TIMELINE_MARKER_STROKE)) - .segmentCount(TIMELINE_SEGMENT_COUNT) - .lineColor(theme.palette().rule()) - .lineThickness(TIMELINE_LINE_THICKNESS) - .padding(new DocumentInsets(TIMELINE_TOP_PADDING, 0, 0, 0)) - .build(); - } + } - private void addMainModule(SectionBuilder main, String title, - CvSection section, boolean bullets, - int limit) { - List lines = sectionLines(section); - if (lines.isEmpty()) { - return; + private DocumentImageData contactIcon(String iconFile) { + return DocumentImageData.fromBytes( + CONTACT_ICON_CACHE.computeIfAbsent(iconFile, + TimelineMinimal::readIconBytes)); } - main.addSection("CvV2TimelineMinimalMain" - + SectionLookup.normalize(title), block -> { - block.spacing(5) - .addParagraph(paragraph -> paragraph - .text(title.toUpperCase(Locale.ROOT)) - .textStyle(mainTitleStyle()) - .margin(DocumentInsets.zero())); - if (bullets) { + + private void addSidebarModule(SectionBuilder sidebar, String title, + CvSection section, int limit) { + List lines = sectionLines(section); + if (lines.isEmpty()) { + return; + } + sidebar.addSection("CvV2TimelineMinimalSidebar" + + SectionLookup.normalize(title), block -> { + block.spacing(6) + .addParagraph(paragraph -> paragraph + .text(title.toUpperCase(Locale.ROOT)) + .textStyle(sidebarTitleStyle()) + .margin(DocumentInsets.zero())); for (String line : lines.stream().limit(limit).toList()) { block.addParagraph(paragraph -> paragraph - .text(excerpt(line, 136)) - .textStyle(mainBulletStyle()) - .lineSpacing(1.2) - .bulletOffset("-") + .text(excerpt(line, 76)) + .textStyle(sidebarBodyStyle()) + .lineSpacing(1) .margin(DocumentInsets.zero())); } - } else { - block.addParagraph(paragraph -> paragraph - .text(excerpt(lines.get(0), 245)) - .textStyle(mainBodyStyle()) - .lineSpacing(1.4) - .margin(DocumentInsets.zero())); + block.addLine(line -> line + .horizontal(118) + .color(theme.palette().rule()) + .thickness(0.65) + .margin(DocumentInsets.top(5))); + }); + } + + /** + * Style applied to the central timeline axis. Drop a custom + * {@link TimelineAxisWidget.Style} here (or expose it through + * the theme) to swap the marker shape, sizing, or colours. + */ + private TimelineAxisWidget.Style timelineAxisStyle() { + return TimelineAxisWidget.Style.builder() + .marker(TimelineAxisWidget.Marker.CIRCLE) + .markerSize(TIMELINE_DOT) + .markerStroke(DocumentStroke.of( + theme.palette().banner(), + TIMELINE_MARKER_STROKE)) + .segmentCount(TIMELINE_SEGMENT_COUNT) + .lineColor(theme.palette().rule()) + .lineThickness(TIMELINE_LINE_THICKNESS) + .padding(new DocumentInsets(TIMELINE_TOP_PADDING, 0, 0, 0)) + .build(); + } + + private void addMainModule(SectionBuilder main, String title, + CvSection section, boolean bullets, + int limit) { + List lines = sectionLines(section); + if (lines.isEmpty()) { + return; } - block.addLine(line -> line - .horizontal(300) - .color(theme.palette().rule()) - .thickness(0.65) - .margin(DocumentInsets.top(6))); - }); - } + main.addSection("CvV2TimelineMinimalMain" + + SectionLookup.normalize(title), block -> { + block.spacing(5) + .addParagraph(paragraph -> paragraph + .text(title.toUpperCase(Locale.ROOT)) + .textStyle(mainTitleStyle()) + .margin(DocumentInsets.zero())); + if (bullets) { + for (String line : lines.stream().limit(limit).toList()) { + block.addParagraph(paragraph -> paragraph + .text(excerpt(line, 136)) + .textStyle(mainBulletStyle()) + .lineSpacing(1.2) + .bulletOffset("-") + .margin(DocumentInsets.zero())); + } + } else { + block.addParagraph(paragraph -> paragraph + .text(excerpt(lines.get(0), 245)) + .textStyle(mainBodyStyle()) + .lineSpacing(1.4) + .margin(DocumentInsets.zero())); + } + block.addLine(line -> line + .horizontal(300) + .color(theme.palette().rule()) + .thickness(0.65) + .margin(DocumentInsets.top(6))); + }); + } - // -- style factories --------------------------------------------- + // -- style factories --------------------------------------------- - private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeHeadline(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle nameStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeHeadline(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle jobTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - 9.5, - DocumentTextDecoration.BOLD, - theme.palette().ink()); - } + private DocumentTextStyle jobTitleStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + 9.5, + DocumentTextDecoration.BOLD, + theme.palette().ink()); + } - private DocumentTextStyle contactTextStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeContact(), - DocumentTextDecoration.BOLD, - theme.palette().muted()); - } + private DocumentTextStyle contactTextStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeContact(), + DocumentTextDecoration.BOLD, + theme.palette().muted()); + } - private DocumentTextStyle fallbackIconStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - 8.0, - DocumentTextDecoration.BOLD, - theme.palette().muted()); - } + private DocumentTextStyle fallbackIconStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + 8.0, + DocumentTextDecoration.BOLD, + theme.palette().muted()); + } - private DocumentTextStyle sidebarTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeEntryTitle(), - DocumentTextDecoration.BOLD, - theme.palette().ink()); - } + private DocumentTextStyle sidebarTitleStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeEntryTitle(), + DocumentTextDecoration.BOLD, + theme.palette().ink()); + } - private DocumentTextStyle sidebarBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeEntrySubtitle(), - DocumentTextDecoration.BOLD, - theme.palette().ink()); - } + private DocumentTextStyle sidebarBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntrySubtitle(), + DocumentTextDecoration.BOLD, + theme.palette().ink()); + } - private DocumentTextStyle mainTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), - theme.typography().sizeBanner(), - DocumentTextDecoration.BOLD, - theme.palette().ink()); - } + private DocumentTextStyle mainTitleStyle() { + return CvTextStyles.of(theme.typography().headlineFont(), + theme.typography().sizeBanner(), + DocumentTextDecoration.BOLD, + theme.palette().ink()); + } - private DocumentTextStyle mainBulletStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeBody(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); - } + private DocumentTextStyle mainBulletStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeBody(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } - private DocumentTextStyle mainBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), - theme.typography().sizeEntryDate(), - DocumentTextDecoration.DEFAULT, - theme.palette().ink()); + private DocumentTextStyle mainBodyStyle() { + return CvTextStyles.of(theme.typography().bodyFont(), + theme.typography().sizeEntryDate(), + DocumentTextDecoration.DEFAULT, + theme.palette().ink()); + } } - } // -- helpers ----------------------------------------------------------- @@ -482,7 +479,7 @@ private DocumentTextStyle mainBodyStyle() { * around the fixed-height timeline axis. */ private static List sectionLines(CvSection section) { - if (section == null || !SectionLookup.hasContent(section)) { + if (!SectionLookup.hasContent(section)) { return List.of(); } List lines = new ArrayList<>(); @@ -613,7 +610,7 @@ private static String spacedUpper(String value) { builder.append(" "); } if (Character.isLetter(current) && i + 1 < upper.length() - && Character.isLetter(upper.charAt(i + 1))) { + && Character.isLetter(upper.charAt(i + 1))) { builder.append(' '); } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvDecoration.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvDecoration.java index 212d479a5..29888cd01 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvDecoration.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvDecoration.java @@ -34,7 +34,9 @@ public record CvDecoration(String bulletGlyph, String stackedIndent, String contactSeparator) { - /** Validates that no token is null. */ + /** + * Validates that no token is null. + */ public CvDecoration { Objects.requireNonNull(bulletGlyph, "bulletGlyph"); Objects.requireNonNull(stackedIndent, "stackedIndent"); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java index a497e9caa..e837d967c 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvPalette.java @@ -24,7 +24,9 @@ public record CvPalette(DocumentColor ink, DocumentColor banner, DocumentColor mainFill) { - /** Validates that no colour token is null. */ + /** + * Validates that no colour token is null. + */ public CvPalette { Objects.requireNonNull(ink, "ink"); Objects.requireNonNull(muted, "muted"); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java index 769eeaa68..95ecb7659 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java @@ -56,7 +56,9 @@ public record CvSpacing( double entryDateWeight, double entrySeparation) { - /** Validates that no inset token is null. */ + /** + * Validates that no inset token is null. + */ public CvSpacing { Objects.requireNonNull(sectionBodyPadding, "sectionBodyPadding"); Objects.requireNonNull(headlinePadding, "headlinePadding"); @@ -90,9 +92,9 @@ public record CvSpacing( * @param entryTitleWeight flex weight of the entry title column * @param entryDateWeight flex weight of the entry date column * @deprecated since {@code entrySeparation} was introduced. - * Supply it explicitly via the 14-arg canonical - * constructor or via {@link #classic()} / - * {@link #modernProfessional()}. + * Supply it explicitly via the 14-arg canonical + * constructor or via {@link #classic()} / + * {@link #modernProfessional()}. */ @Deprecated public CvSpacing(double pageFlowSpacing, diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java index 2229da820..61d2dd45f 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java @@ -30,7 +30,9 @@ public record CvTheme(CvPalette palette, CvSpacing spacing, CvDecoration decoration) { - /** Validates that no sub-record is null. */ + /** + * Validates that no sub-record is null. + */ public CvTheme { Objects.requireNonNull(palette, "palette"); Objects.requireNonNull(typography, "typography"); @@ -48,9 +50,9 @@ public record CvTheme(CvPalette palette, * @param typography font + size scale * @param spacing paddings / margins / weights * @deprecated since the introduction of {@link CvDecoration} — - * pass an explicit decoration so callers can choose - * a different bullet glyph or contact separator - * without forking the renderer. + * pass an explicit decoration so callers can choose + * a different bullet glyph or contact separator + * without forking the renderer. */ @Deprecated public CvTheme(CvPalette palette, CvTypography typography, CvSpacing spacing) { diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java index 6cdaf184d..2f8c9b119 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java @@ -40,7 +40,9 @@ public record CvTypography( double sizeBody, double bodyLineSpacing) { - /** Validates that the font tokens are not null. */ + /** + * Validates that the font tokens are not null. + */ public CvTypography { Objects.requireNonNull(headlineFont, "headlineFont"); Objects.requireNonNull(bodyFont, "bodyFont"); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ContactLine.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ContactLine.java index d122844c7..73cf986fc 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ContactLine.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ContactLine.java @@ -338,11 +338,17 @@ private static void renderStyled(SectionBuilder host, CvIdentity identity, })); } - /** Field order in the rendered line. */ + /** + * Field order in the rendered line. + */ public enum Order { - /** phone → email → address → links. */ + /** + * phone → email → address → links. + */ PHONE_FIRST, - /** address → phone → email → links. */ + /** + * address → phone → email → links. + */ ADDRESS_FIRST } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/FlowSectionHeader.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/FlowSectionHeader.java index 4507d96f3..57baf148b 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/FlowSectionHeader.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/FlowSectionHeader.java @@ -26,13 +26,13 @@ private FlowSectionHeader() { * Renders a filled banner title with a rule above and below. * Visual signature of the Blue Banner preset. * - * @param flow the page-flow builder the rules and banner section are added to - * @param name base node name used for the section and its surrounding rules - * @param title the section title text - * @param ruleWidth width in points of the rules above and below the banner - * @param theme the active theme supplying palette, typography, and spacing - * @param titleStyle text style for the banner title - * @param topRuleMargin outer margin of the rule above the banner + * @param flow the page-flow builder the rules and banner section are added to + * @param name base node name used for the section and its surrounding rules + * @param title the section title text + * @param ruleWidth width in points of the rules above and below the banner + * @param theme the active theme supplying palette, typography, and spacing + * @param titleStyle text style for the banner title + * @param topRuleMargin outer margin of the rule above the banner * @param bottomRuleMargin outer margin of the rule below the banner */ public static void banner(PageFlowBuilder flow, @@ -50,14 +50,14 @@ public static void banner(PageFlowBuilder flow, /** * Renders a filled banner title with caller-controlled rule colour. * - * @param flow the page-flow builder the rules and banner section are added to - * @param name base node name used for the section and its surrounding rules - * @param title the section title text - * @param ruleWidth width in points of the rules above and below the banner - * @param theme the active theme supplying palette, typography, and spacing - * @param titleStyle text style for the banner title - * @param ruleColor colour of the rules above and below the banner - * @param topRuleMargin outer margin of the rule above the banner + * @param flow the page-flow builder the rules and banner section are added to + * @param name base node name used for the section and its surrounding rules + * @param title the section title text + * @param ruleWidth width in points of the rules above and below the banner + * @param theme the active theme supplying palette, typography, and spacing + * @param titleStyle text style for the banner title + * @param ruleColor colour of the rules above and below the banner + * @param topRuleMargin outer margin of the rule above the banner * @param bottomRuleMargin outer margin of the rule below the banner */ public static void banner(PageFlowBuilder flow, @@ -81,16 +81,16 @@ public static void banner(PageFlowBuilder flow, * Renders a plain left-aligned title between horizontal rules. * Visual signature of the Editorial Blue preset. * - * @param flow the page-flow builder the rules and title section are added to - * @param name base node name used for the section and its surrounding rules - * @param title the section title text - * @param ruleWidth width in points of the surrounding rules - * @param theme the active theme supplying palette, typography, and spacing - * @param titleStyle text style for the title - * @param topRuleMargin outer margin of the rule above the title - * @param titlePadding inner padding of the title section + * @param flow the page-flow builder the rules and title section are added to + * @param name base node name used for the section and its surrounding rules + * @param title the section title text + * @param ruleWidth width in points of the surrounding rules + * @param theme the active theme supplying palette, typography, and spacing + * @param titleStyle text style for the title + * @param topRuleMargin outer margin of the rule above the title + * @param titlePadding inner padding of the title section * @param bottomRuleMargin outer margin of the rule below the title - * @param withTopRule whether to render the rule above the title + * @param withTopRule whether to render the rule above the title */ public static void label(PageFlowBuilder flow, String name, @@ -111,17 +111,17 @@ public static void label(PageFlowBuilder flow, * Renders a plain left-aligned title with caller-controlled rule * colour. * - * @param flow the page-flow builder the rules and title section are added to - * @param name base node name used for the section and its surrounding rules - * @param title the section title text - * @param ruleWidth width in points of the surrounding rules - * @param theme the active theme supplying palette, typography, and spacing - * @param titleStyle text style for the title - * @param ruleColor colour of the surrounding rules - * @param topRuleMargin outer margin of the rule above the title - * @param titlePadding inner padding of the title section + * @param flow the page-flow builder the rules and title section are added to + * @param name base node name used for the section and its surrounding rules + * @param title the section title text + * @param ruleWidth width in points of the surrounding rules + * @param theme the active theme supplying palette, typography, and spacing + * @param titleStyle text style for the title + * @param ruleColor colour of the surrounding rules + * @param topRuleMargin outer margin of the rule above the title + * @param titlePadding inner padding of the title section * @param bottomRuleMargin outer margin of the rule below the title - * @param withTopRule whether to render the rule above the title + * @param withTopRule whether to render the rule above the title */ public static void label(PageFlowBuilder flow, String name, diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java index 0ad816ff5..a79954324 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/IconTextRow.java @@ -41,7 +41,9 @@ */ public final class IconTextRow { - /** Spacer between the icon glyph and the label text. */ + /** + * Spacer between the icon glyph and the label text. + */ private static final String GAP = " "; private IconTextRow() { diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Masthead.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Masthead.java index 3f8d1bedf..b20b2eba2 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Masthead.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Masthead.java @@ -153,7 +153,9 @@ public record Style(DocumentTextStyle nameStyle, String metaJoiner, DocumentInsets lineMargin) { - /** Applies defaults for {@code metaJoiner} and {@code lineMargin}. */ + /** + * Applies defaults for {@code metaJoiner} and {@code lineMargin}. + */ public Style { metaJoiner = metaJoiner == null ? " - " : metaJoiner; lineMargin = lineMargin == null diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java index ed8dc211b..6e853d00d 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java @@ -82,7 +82,7 @@ public static void render(SectionBuilder host, DocumentTextStyle bodyStyle = Objects.requireNonNull( safeStyle.bodyStyle(), "ProfileBand bodyStyle"); if (title != null && !title.isBlank() - && safeStyle.titleStyle() != null) { + && safeStyle.titleStyle() != null) { host.addParagraph(paragraph -> paragraph .text(safeStyle.transformTitle() ? title.toUpperCase(java.util.Locale.ROOT) @@ -137,7 +137,9 @@ public record Style(double spacing, TextAlign bodyAlign, double bodyLineSpacing) { - /** Applies defaults for {@code padding}, {@code titleAlign}, and {@code bodyAlign}. */ + /** + * Applies defaults for {@code padding}, {@code titleAlign}, and {@code bodyAlign}. + */ public Style { padding = padding == null ? DocumentInsets.zero() : padding; titleAlign = titleAlign == null ? TextAlign.LEFT : titleAlign; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java index 54e5a95c6..915cf33b1 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java @@ -198,11 +198,11 @@ public static void flatSpacedCaps(SectionBuilder host, String title, DocumentTextStyle resolved = titleStyle != null ? titleStyle : DocumentTextStyle.builder() - .fontName(theme.typography().bodyFont()) - .size(theme.typography().sizeBanner()) - .decoration(DocumentTextDecoration.BOLD) - .color(color) - .build(); + .fontName(theme.typography().bodyFont()) + .size(theme.typography().sizeBanner()) + .decoration(DocumentTextDecoration.BOLD) + .color(color) + .build(); host.padding(new DocumentInsets(0, 0, 0, 0)) .addParagraph(p -> p .text(TextOrnaments.spacedUpper(title)) @@ -250,11 +250,11 @@ public static void tickLabel(SectionBuilder host, String title, DocumentTextStyle resolved = titleStyle != null ? titleStyle : DocumentTextStyle.builder() - .fontName(theme.typography().headlineFont()) - .size(theme.typography().sizeBanner()) - .decoration(DocumentTextDecoration.BOLD) - .color(color) - .build(); + .fontName(theme.typography().headlineFont()) + .size(theme.typography().sizeBanner()) + .decoration(DocumentTextDecoration.BOLD) + .color(color) + .build(); host.spacing(3) .addShape(shape -> shape .name("CvV2SectionHeaderTick") diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java index e60d76296..4ad719077 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java @@ -55,16 +55,24 @@ */ public final class SkillBar { - /** Track stroke width in points — a hairline rule. */ + /** + * Track stroke width in points — a hairline rule. + */ private static final double TRACK_THICKNESS = 0.65; - /** Proficiency marker stroke width in points — heavier than the track. */ + /** + * Proficiency marker stroke width in points — heavier than the track. + */ private static final double MARKER_THICKNESS = 1.2; - /** Proficiency marker height in points. */ + /** + * Proficiency marker height in points. + */ private static final double MARKER_HEIGHT = 8.0; - /** Gap (points) between the skill label and the track below it. */ + /** + * Gap (points) between the skill label and the track below it. + */ private static final double LABEL_TO_TRACK_GAP = 8.0; /** @@ -74,7 +82,9 @@ public final class SkillBar { */ private static final double MARKER_OVERLAP = MARKER_HEIGHT / 2.0 + 0.35; - /** Gap (points) below the marker before the next skill bar. */ + /** + * Gap (points) below the marker before the next skill bar. + */ private static final double BAR_BOTTOM_GAP = 12.0; private SkillBar() { diff --git a/src/main/java/com/demcha/compose/document/templates/data/common/EmailYaml.java b/src/main/java/com/demcha/compose/document/templates/data/common/EmailYaml.java index 4d2ceb057..9c13b8559 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/common/EmailYaml.java +++ b/src/main/java/com/demcha/compose/document/templates/data/common/EmailYaml.java @@ -49,7 +49,7 @@ public static EmailYaml mailto(String to) { /** * Creates a mailto link with custom display text. * - * @param to target email address + * @param to target email address * @param displayText visible link text * @return email payload */ diff --git a/src/main/java/com/demcha/compose/document/templates/data/common/Header.java b/src/main/java/com/demcha/compose/document/templates/data/common/Header.java index ab3f859d0..4a9138631 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/common/Header.java +++ b/src/main/java/com/demcha/compose/document/templates/data/common/Header.java @@ -96,7 +96,7 @@ public Builder email(EmailYaml email) { /** * Creates and sets email contact metadata. * - * @param to target email address + * @param to target email address * @param displayText visible link text * @return this builder */ @@ -119,7 +119,7 @@ public Builder gitHub(LinkYml gitHub) { /** * Creates and sets GitHub link metadata. * - * @param url GitHub URL + * @param url GitHub URL * @param displayText visible link text * @return this builder */ @@ -142,7 +142,7 @@ public Builder linkedIn(LinkYml linkedIn) { /** * Creates and sets LinkedIn link metadata. * - * @param url LinkedIn URL + * @param url LinkedIn URL * @param displayText visible link text * @return this builder */ diff --git a/src/main/java/com/demcha/compose/document/templates/data/common/LinkYml.java b/src/main/java/com/demcha/compose/document/templates/data/common/LinkYml.java index e4762b31d..10031ea9a 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/common/LinkYml.java +++ b/src/main/java/com/demcha/compose/document/templates/data/common/LinkYml.java @@ -35,7 +35,7 @@ public static Builder builder() { /** * Creates a link payload from URL and display text. * - * @param url target URL + * @param url target URL * @param displayText visible link text * @return link payload */ diff --git a/src/main/java/com/demcha/compose/document/templates/data/coverletter/CoverLetterDocumentSpec.java b/src/main/java/com/demcha/compose/document/templates/data/coverletter/CoverLetterDocumentSpec.java index a7ae01493..f4dc69a42 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/coverletter/CoverLetterDocumentSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/data/coverletter/CoverLetterDocumentSpec.java @@ -11,15 +11,15 @@ *

Authoring role: keeps cover-letter composition document-shaped: * one header, one body, and optional job context for personalization.

* - * @param header contact/profile header rendered before the letter body - * @param body cover-letter body text + * @param header contact/profile header rendered before the letter body + * @param body cover-letter body text * @param jobDetails target role metadata used by templates * @author Artem Demchyshyn * @deprecated Test-only dead code; the live CV/cover-letter model is - * {@code cv.v2} / {@code coverletter.v2}. Kept for backward - * compatibility; scheduled for removal in a future major. See - * {@code docs/templates/v2-layered/} and - * {@link com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument}. + * {@code cv.v2} / {@code coverletter.v2}. Kept for backward + * compatibility; scheduled for removal in a future major. See + * {@code docs/templates/v2-layered/} and + * {@link com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument}. */ @Deprecated(since = "1.7.0", forRemoval = true) public record CoverLetterDocumentSpec( @@ -38,8 +38,8 @@ public record CoverLetterDocumentSpec( /** * Creates a document spec from the common cover-letter inputs. * - * @param header contact/profile header - * @param body cover-letter body text + * @param header contact/profile header + * @param body cover-letter body text * @param jobDetails target role metadata * @return document spec */ diff --git a/src/main/java/com/demcha/compose/document/templates/data/coverletter/JobDetails.java b/src/main/java/com/demcha/compose/document/templates/data/coverletter/JobDetails.java index 1f458b8f3..fba48c7d3 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/coverletter/JobDetails.java +++ b/src/main/java/com/demcha/compose/document/templates/data/coverletter/JobDetails.java @@ -11,11 +11,11 @@ *

Mutability: immutable record. Thread-safety: thread-safe * when referenced through immutable component values.

* - * @param url optional job posting URL - * @param title target role title - * @param company target company name - * @param location target job location - * @param description optional job description text + * @param url optional job posting URL + * @param title target role title + * @param company target company name + * @param location target job location + * @param description optional job description text * @param seniorityLevel optional seniority label * @param employmentType optional employment type label */ diff --git a/src/main/java/com/demcha/compose/document/templates/data/cv/CvModule.java b/src/main/java/com/demcha/compose/document/templates/data/cv/CvModule.java index 8e310f5e8..0ff7434a4 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/cv/CvModule.java +++ b/src/main/java/com/demcha/compose/document/templates/data/cv/CvModule.java @@ -19,8 +19,8 @@ * a divider, a page break, or a small custom block without writing raw * template-scene code.

* - * @param name stable semantic module name used for snapshot/debug naming - * @param title human-readable module title rendered as the section heading + * @param name stable semantic module name used for snapshot/debug naming + * @param title human-readable module title rendered as the section heading * @param bodyBlocks ordered body blocks rendered below the heading * @author Artem Demchyshyn */ @@ -45,7 +45,7 @@ public record CvModule( * Creates a one-paragraph module. * * @param title visible module title - * @param text paragraph body + * @param text paragraph body * @return module spec */ public static CvModule paragraph(String title, String text) { @@ -82,7 +82,7 @@ public static CvModule list(String title, String... items) { * Creates a markerless row module with aligned wrapped continuations. * * @param title visible module title - * @param rows ordered row texts + * @param rows ordered row texts * @return module spec */ public static CvModule rows(String title, List rows) { @@ -95,7 +95,7 @@ public static CvModule rows(String title, List rows) { * Creates a markerless row module with aligned wrapped continuations. * * @param title visible module title - * @param rows ordered row texts + * @param rows ordered row texts * @return module spec */ public static CvModule rows(String title, String... rows) { @@ -447,7 +447,7 @@ public Builder paragraph(String text) { /** * Appends a paragraph block with an explicit first-line indent. * - * @param text paragraph text + * @param text paragraph text * @param firstLineIndent first-line indent prefix * @return this builder */ @@ -471,7 +471,7 @@ public Builder list(List items) { * Appends a configurable list block. * * @param items ordered item texts - * @param spec optional list configuration + * @param spec optional list configuration * @return this builder */ public Builder list(List items, Consumer spec) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceData.java b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceData.java index 69a5c6377..83c2ab5da 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceData.java +++ b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceData.java @@ -1,26 +1,26 @@ package com.demcha.compose.document.templates.data.invoice; +import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.ArrayList; import java.util.function.Consumer; /** * Display-oriented invoice document input. * - * @param title display title + * @param title display title * @param invoiceNumber invoice number shown in the header - * @param issueDate invoice issue date - * @param dueDate payment due date - * @param reference optional customer/project reference - * @param status optional invoice status label - * @param fromParty sender/supplier party - * @param billToParty recipient/customer party - * @param lineItems invoice line items - * @param summaryRows subtotal/tax/total rows - * @param notes invoice notes - * @param paymentTerms payment term rows - * @param footerNote footer note rendered at the bottom + * @param issueDate invoice issue date + * @param dueDate payment due date + * @param reference optional customer/project reference + * @param status optional invoice status label + * @param fromParty sender/supplier party + * @param billToParty recipient/customer party + * @param lineItems invoice line items + * @param summaryRows subtotal/tax/total rows + * @param notes invoice notes + * @param paymentTerms payment term rows + * @param footerNote footer note rendered at the bottom */ public record InvoiceData( String title, @@ -243,10 +243,10 @@ public Builder lineItem(Consumer spec) { * Appends a line item from display values. * * @param description item description - * @param details optional details - * @param quantity quantity text - * @param unitPrice unit price text - * @param amount amount text + * @param details optional details + * @param quantity quantity text + * @param unitPrice unit price text + * @param amount amount text * @return this builder */ public Builder lineItem(String description, String details, String quantity, String unitPrice, String amount) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceDocumentSpec.java b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceDocumentSpec.java index e7aea3430..37299f347 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceDocumentSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceDocumentSpec.java @@ -199,10 +199,10 @@ public Builder lineItem(Consumer spec) { * Appends a line item from display values. * * @param description item description - * @param details optional details - * @param quantity quantity text - * @param unitPrice unit price text - * @param amount amount text + * @param details optional details + * @param quantity quantity text + * @param unitPrice unit price text + * @param amount amount text * @return this builder */ public Builder lineItem(String description, String details, String quantity, String unitPrice, String amount) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceLineItem.java b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceLineItem.java index f49378b7b..555fa0cc6 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceLineItem.java +++ b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceLineItem.java @@ -6,10 +6,10 @@ * Display-oriented invoice line item. * * @param description item description - * @param details optional supporting details - * @param quantity display quantity - * @param unitPrice display unit price - * @param amount display amount + * @param details optional supporting details + * @param quantity display quantity + * @param unitPrice display unit price + * @param amount display amount */ public record InvoiceLineItem( String description, diff --git a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceParty.java b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceParty.java index 3d36ea27a..8f382d99b 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceParty.java +++ b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceParty.java @@ -1,17 +1,17 @@ package com.demcha.compose.document.templates.data.invoice; +import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.ArrayList; /** * Display-oriented invoice party details. * - * @param name party/company name + * @param name party/company name * @param addressLines address lines in display order - * @param email optional email address - * @param phone optional phone number - * @param taxId optional tax or company identifier + * @param email optional email address + * @param phone optional phone number + * @param taxId optional tax or company identifier */ public record InvoiceParty( String name, diff --git a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceSummaryRow.java b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceSummaryRow.java index 2a91e0aa9..5002501e3 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceSummaryRow.java +++ b/src/main/java/com/demcha/compose/document/templates/data/invoice/InvoiceSummaryRow.java @@ -5,8 +5,8 @@ /** * Display-oriented invoice summary row. * - * @param label row label - * @param value row value + * @param label row label + * @param value row value * @param emphasized whether the row should be visually emphasized */ public record InvoiceSummaryRow( diff --git a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalData.java b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalData.java index 34f0df1fc..8fa1b0bb5 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalData.java +++ b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalData.java @@ -1,26 +1,26 @@ package com.demcha.compose.document.templates.data.proposal; +import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.ArrayList; import java.util.function.Consumer; /** * Display-oriented proposal document input. * - * @param title display title - * @param proposalNumber proposal number shown in the header - * @param preparedDate proposal preparation date - * @param validUntil optional validity date - * @param projectTitle project title + * @param title display title + * @param proposalNumber proposal number shown in the header + * @param preparedDate proposal preparation date + * @param validUntil optional validity date + * @param projectTitle project title * @param executiveSummary summary paragraph - * @param sender sender/provider party - * @param recipient recipient/client party - * @param sections proposal body sections - * @param timeline timeline rows - * @param pricingRows pricing rows - * @param acceptanceTerms acceptance term rows - * @param footerNote footer note rendered at the bottom + * @param sender sender/provider party + * @param recipient recipient/client party + * @param sections proposal body sections + * @param timeline timeline rows + * @param pricingRows pricing rows + * @param acceptanceTerms acceptance term rows + * @param footerNote footer note rendered at the bottom */ public record ProposalData( String title, @@ -242,7 +242,7 @@ public Builder section(Consumer spec) { /** * Appends a proposal section from title and paragraph text. * - * @param title section title + * @param title section title * @param paragraphs section paragraphs * @return this builder */ @@ -295,9 +295,9 @@ public Builder timelineItem(Consumer spec) { /** * Appends a timeline row from display values. * - * @param phase phase label + * @param phase phase label * @param duration duration text - * @param details supporting details + * @param details supporting details * @return this builder */ public Builder timelineItem(String phase, String duration, String details) { @@ -346,9 +346,9 @@ public Builder pricingRow(Consumer spec) { /** * Appends a normal pricing row. * - * @param label row label + * @param label row label * @param description row description - * @param amount amount text + * @param amount amount text * @return this builder */ public Builder pricingRow(String label, String description, String amount) { @@ -358,9 +358,9 @@ public Builder pricingRow(String label, String description, String amount) { /** * Appends an emphasized pricing row. * - * @param label row label + * @param label row label * @param description row description - * @param amount amount text + * @param amount amount text * @return this builder */ public Builder emphasizedPricingRow(String label, String description, String amount) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalDocumentSpec.java b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalDocumentSpec.java index e916718b8..670a12fa7 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalDocumentSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalDocumentSpec.java @@ -198,7 +198,7 @@ public Builder section(Consumer spec) { /** * Appends a proposal section from title and paragraphs. * - * @param title section title + * @param title section title * @param paragraphs section paragraphs * @return this builder */ @@ -243,9 +243,9 @@ public Builder timelineItem(Consumer spec) { /** * Appends a timeline row from display values. * - * @param phase phase label + * @param phase phase label * @param duration duration text - * @param details supporting details + * @param details supporting details * @return this builder */ public Builder timelineItem(String phase, String duration, String details) { @@ -289,9 +289,9 @@ public Builder pricingRow(Consumer spec) { /** * Appends a normal pricing row. * - * @param label row label + * @param label row label * @param description row description - * @param amount amount text + * @param amount amount text * @return this builder */ public Builder pricingRow(String label, String description, String amount) { @@ -302,9 +302,9 @@ public Builder pricingRow(String label, String description, String amount) { /** * Appends an emphasized pricing row. * - * @param label row label + * @param label row label * @param description row description - * @param amount amount text + * @param amount amount text * @return this builder */ public Builder emphasizedPricingRow(String label, String description, String amount) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalParty.java b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalParty.java index 98fb069a0..ae49c03d8 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalParty.java +++ b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalParty.java @@ -1,17 +1,17 @@ package com.demcha.compose.document.templates.data.proposal; +import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.ArrayList; /** * Display-oriented proposal party details. * - * @param name party/company name + * @param name party/company name * @param addressLines address lines in display order - * @param email optional email address - * @param phone optional phone number - * @param website optional website URL + * @param email optional email address + * @param phone optional phone number + * @param website optional website URL */ public record ProposalParty( String name, diff --git a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalPricingRow.java b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalPricingRow.java index 547060b51..e9b06c61e 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalPricingRow.java +++ b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalPricingRow.java @@ -5,10 +5,10 @@ /** * Display-oriented proposal pricing row. * - * @param label row label + * @param label row label * @param description row description - * @param amount display amount - * @param emphasized whether the row should be visually emphasized + * @param amount display amount + * @param emphasized whether the row should be visually emphasized */ public record ProposalPricingRow( String label, diff --git a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalSection.java b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalSection.java index 240b22874..c1562f203 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalSection.java +++ b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalSection.java @@ -1,13 +1,13 @@ package com.demcha.compose.document.templates.data.proposal; +import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.ArrayList; /** * Display-oriented proposal section with paragraph content. * - * @param title section title + * @param title section title * @param paragraphs section paragraphs in display order */ public record ProposalSection( diff --git a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalTimelineItem.java b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalTimelineItem.java index 3596e4879..b6b653941 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalTimelineItem.java +++ b/src/main/java/com/demcha/compose/document/templates/data/proposal/ProposalTimelineItem.java @@ -5,9 +5,9 @@ /** * Display-oriented timeline item for proposals. * - * @param phase timeline phase label + * @param phase timeline phase label * @param duration display duration - * @param details supporting details + * @param details supporting details */ public record ProposalTimelineItem( String phase, diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleAssignment.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleAssignment.java index 2ff915265..592e7ab28 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleAssignment.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleAssignment.java @@ -1,17 +1,18 @@ package com.demcha.compose.document.templates.data.schedule; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Objects; /** * Display-oriented assignment for one person/day cell. * - * @param personId person identifier - * @param dayId day identifier + * @param personId person identifier + * @param dayId day identifier * @param categoryId category identifier - * @param slots shift/time slots - * @param note optional assignment note + * @param slots shift/time slots + * @param note optional assignment note */ public record ScheduleAssignment( String personId, @@ -109,9 +110,7 @@ public Builder slots(List slots) { public Builder slots(ScheduleSlot... slots) { this.slots.clear(); if (slots != null) { - for (ScheduleSlot slot : slots) { - this.slots.add(slot); - } + Collections.addAll(this.slots, slots); } return this; } @@ -131,7 +130,7 @@ public Builder addSlot(ScheduleSlot slot) { * Appends a slot row from start and end labels. * * @param start start label - * @param end end label + * @param end end label * @return this builder */ public Builder slot(String start, String end) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleCategory.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleCategory.java index b29a072dd..0dff636af 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleCategory.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleCategory.java @@ -1,15 +1,15 @@ package com.demcha.compose.document.templates.data.schedule; -import java.awt.Color; +import java.awt.*; import java.util.Objects; /** * Shared category catalog entry referenced by days and assignments. * - * @param id stable category identifier - * @param label display label - * @param fillColor category fill color - * @param textColor category text color + * @param id stable category identifier + * @param label display label + * @param fillColor category fill color + * @param textColor category text color * @param borderColor category border color */ public record ScheduleCategory( @@ -33,9 +33,9 @@ public record ScheduleCategory( /** * Creates a category using black text. * - * @param id stable category identifier - * @param label display label - * @param fillColor fill color + * @param id stable category identifier + * @param label display label + * @param fillColor fill color * @param borderColor border color * @return schedule category */ @@ -46,10 +46,10 @@ public static ScheduleCategory of(String id, String label, Color fillColor, Colo /** * Creates a category with explicit fill, text, and border colors. * - * @param id stable category identifier - * @param label display label - * @param fillColor fill color - * @param textColor text color + * @param id stable category identifier + * @param label display label + * @param fillColor fill color + * @param textColor text color * @param borderColor border color * @return schedule category */ diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleDay.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleDay.java index 3ce543df6..05dab5492 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleDay.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleDay.java @@ -5,9 +5,9 @@ /** * Weekly day header information. * - * @param id stable day identifier - * @param label display day label - * @param headerNote optional header note + * @param id stable day identifier + * @param label display day label + * @param headerNote optional header note * @param headerCategoryId optional category shown in the header */ public record ScheduleDay( @@ -29,9 +29,9 @@ public record ScheduleDay( /** * Creates a day header entry. * - * @param id stable day identifier - * @param label display day label - * @param headerNote optional header note + * @param id stable day identifier + * @param label display day label + * @param headerNote optional header note * @param headerCategoryId optional header category identifier * @return schedule day */ diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleMetricRow.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleMetricRow.java index 8b43280eb..848e097c4 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleMetricRow.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleMetricRow.java @@ -1,13 +1,14 @@ package com.demcha.compose.document.templates.data.schedule; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Objects; /** * Label-plus-values row rendered above the roster matrix. * - * @param label metric label + * @param label metric label * @param dayValues values aligned to days in display order */ public record ScheduleMetricRow( @@ -25,7 +26,7 @@ public record ScheduleMetricRow( /** * Creates a metric row from a label and day values. * - * @param label metric label + * @param label metric label * @param dayValues values aligned to schedule days * @return schedule metric row */ @@ -89,9 +90,7 @@ public Builder dayValues(List dayValues) { public Builder dayValues(String... dayValues) { this.dayValues.clear(); if (dayValues != null) { - for (String dayValue : dayValues) { - this.dayValues.add(dayValue); - } + Collections.addAll(this.dayValues, dayValues); } return this; } diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/SchedulePerson.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/SchedulePerson.java index ee590cd5b..75a566820 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/SchedulePerson.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/SchedulePerson.java @@ -5,9 +5,9 @@ /** * Person row in the weekly roster matrix. * - * @param id stable person identifier + * @param id stable person identifier * @param displayName display name - * @param sortOrder ordering token for roster display + * @param sortOrder ordering token for roster display */ public record SchedulePerson( String id, @@ -25,9 +25,9 @@ public record SchedulePerson( /** * Creates a person row. * - * @param id stable person identifier + * @param id stable person identifier * @param displayName display name - * @param sortOrder ordering token + * @param sortOrder ordering token * @return schedule person */ public static SchedulePerson of(String id, String displayName, int sortOrder) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleSlot.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleSlot.java index e99511b22..0cda177df 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleSlot.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/ScheduleSlot.java @@ -6,7 +6,7 @@ * Display-first shift segment rendered inside a schedule cell. * * @param start start time/label - * @param end end time/label + * @param end end time/label */ public record ScheduleSlot( String start, @@ -24,7 +24,7 @@ public record ScheduleSlot( * Creates a schedule slot from start and end labels. * * @param start start label - * @param end end label + * @param end end label * @return schedule slot */ public static ScheduleSlot of(String start, String end) { diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleData.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleData.java index 15aaf65f3..3666fc840 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleData.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleData.java @@ -1,7 +1,8 @@ package com.demcha.compose.document.templates.data.schedule; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.Consumer; @@ -9,14 +10,14 @@ /** * Display-oriented weekly schedule document input. * - * @param title document title - * @param weekLabel display week label - * @param days days in display order - * @param categories shared category catalog + * @param title document title + * @param weekLabel display week label + * @param days days in display order + * @param categories shared category catalog * @param headerMetrics metric rows rendered above the matrix - * @param people people rows in the schedule matrix - * @param assignments person/day assignments - * @param footerNotes footer notes rendered after the matrix + * @param people people rows in the schedule matrix + * @param assignments person/day assignments + * @param footerNotes footer notes rendered after the matrix */ public record WeeklyScheduleData( String title, @@ -131,9 +132,9 @@ public Builder day(Consumer spec) { /** * Appends a day header from display values. * - * @param id stable day identifier - * @param label display day label - * @param headerNote optional header note + * @param id stable day identifier + * @param label display day label + * @param headerNote optional header note * @param headerCategoryId optional category identifier * @return this builder */ @@ -183,9 +184,9 @@ public Builder category(Consumer spec) { /** * Appends a category using black text. * - * @param id stable category identifier - * @param label display label - * @param fillColor fill color + * @param id stable category identifier + * @param label display label + * @param fillColor fill color * @param borderColor border color * @return this builder */ @@ -196,10 +197,10 @@ public Builder category(String id, String label, Color fillColor, Color borderCo /** * Appends a category with explicit text color. * - * @param id stable category identifier - * @param label display label - * @param fillColor fill color - * @param textColor text color + * @param id stable category identifier + * @param label display label + * @param fillColor fill color + * @param textColor text color * @param borderColor border color * @return this builder */ @@ -249,7 +250,7 @@ public Builder headerMetric(Consumer spec) { /** * Appends a header metric row from label and values. * - * @param label metric label + * @param label metric label * @param dayValues day values * @return this builder */ @@ -260,7 +261,7 @@ public Builder headerMetric(String label, List dayValues) { /** * Appends a header metric row from label and values. * - * @param label metric label + * @param label metric label * @param dayValues day values * @return this builder */ @@ -313,9 +314,9 @@ public Builder person(Consumer spec) { /** * Appends a person row from display values. * - * @param id person identifier + * @param id person identifier * @param displayName display name - * @param sortOrder sort order + * @param sortOrder sort order * @return this builder */ public Builder person(String id, String displayName, int sortOrder) { @@ -364,18 +365,16 @@ public Builder assignment(Consumer spec) { /** * Appends an assignment from ids and slot rows. * - * @param personId person identifier - * @param dayId day identifier + * @param personId person identifier + * @param dayId day identifier * @param categoryId category identifier - * @param slots assignment slots + * @param slots assignment slots * @return this builder */ public Builder assignment(String personId, String dayId, String categoryId, ScheduleSlot... slots) { List normalizedSlots = new ArrayList<>(); if (slots != null) { - for (ScheduleSlot slot : slots) { - normalizedSlots.add(slot); - } + Collections.addAll(normalizedSlots, slots); } return assignment(personId, dayId, categoryId, normalizedSlots, ""); } @@ -383,11 +382,11 @@ public Builder assignment(String personId, String dayId, String categoryId, Sche /** * Appends an assignment from ids, slot rows, and a note. * - * @param personId person identifier - * @param dayId day identifier + * @param personId person identifier + * @param dayId day identifier * @param categoryId category identifier - * @param slots assignment slots - * @param note optional note + * @param slots assignment slots + * @param note optional note * @return this builder */ public Builder assignment(String personId, diff --git a/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleDocumentSpec.java b/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleDocumentSpec.java index 0fa8bd6ef..8589d8797 100644 --- a/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleDocumentSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/data/schedule/WeeklyScheduleDocumentSpec.java @@ -1,6 +1,6 @@ package com.demcha.compose.document.templates.data.schedule; -import java.awt.Color; +import java.awt.*; import java.util.List; import java.util.function.Consumer; @@ -110,9 +110,9 @@ public Builder day(Consumer spec) { /** * Appends a day header from display values. * - * @param id stable day identifier - * @param label display day label - * @param headerNote optional header note + * @param id stable day identifier + * @param label display day label + * @param headerNote optional header note * @param headerCategoryId optional category identifier * @return this builder */ @@ -157,9 +157,9 @@ public Builder category(Consumer spec) { /** * Appends a category using black text. * - * @param id stable category identifier - * @param label display label - * @param fillColor fill color + * @param id stable category identifier + * @param label display label + * @param fillColor fill color * @param borderColor border color * @return this builder */ @@ -171,10 +171,10 @@ public Builder category(String id, String label, Color fillColor, Color borderCo /** * Appends a category with explicit text color. * - * @param id stable category identifier - * @param label display label - * @param fillColor fill color - * @param textColor text color + * @param id stable category identifier + * @param label display label + * @param fillColor fill color + * @param textColor text color * @param borderColor border color * @return this builder */ @@ -219,7 +219,7 @@ public Builder headerMetric(Consumer spec) { /** * Appends a header metric row from label and values. * - * @param label metric label + * @param label metric label * @param dayValues day values * @return this builder */ @@ -231,7 +231,7 @@ public Builder headerMetric(String label, List dayValues) { /** * Appends a header metric row from label and values. * - * @param label metric label + * @param label metric label * @param dayValues day values * @return this builder */ @@ -276,9 +276,9 @@ public Builder person(Consumer spec) { /** * Appends a person row from display values. * - * @param id person identifier + * @param id person identifier * @param displayName display name - * @param sortOrder sort order + * @param sortOrder sort order * @return this builder */ public Builder person(String id, String displayName, int sortOrder) { @@ -322,10 +322,10 @@ public Builder assignment(Consumer spec) { /** * Appends an assignment from ids and slot rows. * - * @param personId person identifier - * @param dayId day identifier + * @param personId person identifier + * @param dayId day identifier * @param categoryId category identifier - * @param slots assignment slots + * @param slots assignment slots * @return this builder */ public Builder assignment(String personId, String dayId, String categoryId, ScheduleSlot... slots) { @@ -336,11 +336,11 @@ public Builder assignment(String personId, String dayId, String categoryId, Sche /** * Appends an assignment from ids, slot rows, and a note. * - * @param personId person identifier - * @param dayId day identifier + * @param personId person identifier + * @param dayId day identifier * @param categoryId category identifier - * @param slots assignment slots - * @param note optional note + * @param slots assignment slots + * @param note optional note * @return this builder */ public Builder assignment(String personId, diff --git a/src/main/java/com/demcha/compose/document/templates/decorations/Divider.java b/src/main/java/com/demcha/compose/document/templates/decorations/Divider.java index 6ffa71ac1..7d8bc7fcf 100644 --- a/src/main/java/com/demcha/compose/document/templates/decorations/Divider.java +++ b/src/main/java/com/demcha/compose/document/templates/decorations/Divider.java @@ -37,10 +37,14 @@ */ public final class Divider { - /** Default thin rule thickness in points. */ + /** + * Default thin rule thickness in points. + */ public static final double THIN_THICKNESS = 0.5; - /** Default thick rule thickness in points. */ + /** + * Default thick rule thickness in points. + */ public static final double THICK_THICKNESS = 1.5; private Divider() { diff --git a/src/main/java/com/demcha/compose/document/templates/decorations/Spacer.java b/src/main/java/com/demcha/compose/document/templates/decorations/Spacer.java index 106eb8dc5..b84d0138a 100644 --- a/src/main/java/com/demcha/compose/document/templates/decorations/Spacer.java +++ b/src/main/java/com/demcha/compose/document/templates/decorations/Spacer.java @@ -21,13 +21,19 @@ */ public final class Spacer { - /** Vertical extent of {@link #small()} in points. */ + /** + * Vertical extent of {@link #small()} in points. + */ public static final double SMALL = 4.0; - /** Vertical extent of {@link #medium()} in points. */ + /** + * Vertical extent of {@link #medium()} in points. + */ public static final double MEDIUM = 8.0; - /** Vertical extent of {@link #large()} in points. */ + /** + * Vertical extent of {@link #large()} in points. + */ public static final double LARGE = 16.0; private Spacer() { @@ -70,7 +76,7 @@ public static DocumentNode large() { * non-negative * @return spacer node * @throws IllegalArgumentException if {@code height} is negative, - * {@code NaN}, or infinite + * {@code NaN}, or infinite */ public static DocumentNode height(double height) { return verticalSpacer("Spacer.height", height); diff --git a/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java b/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java index ffbb166b7..db08b69b6 100644 --- a/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java +++ b/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java @@ -151,7 +151,7 @@ public void compose(DocumentSession session, InvoiceSpec spec) { List children = new ArrayList<>(); children.add(headingRow("Invoice " + spec.invoiceNumber())); children.add(bodyParagraph("Issued: " + spec.issueDate() - + (spec.dueDate().isBlank() ? "" : " Due: " + spec.dueDate()))); + + (spec.dueDate().isBlank() ? "" : " Due: " + spec.dueDate()))); children.add(partyBlock("From", spec.fromParty())); children.add(partyBlock("Bill To", spec.billToParty())); children.add(lineItemsBlock(spec.lineItems())); diff --git a/src/main/java/com/demcha/compose/document/templates/invoice/presets/ModernInvoice.java b/src/main/java/com/demcha/compose/document/templates/invoice/presets/ModernInvoice.java index f15c83add..d879175ab 100644 --- a/src/main/java/com/demcha/compose/document/templates/invoice/presets/ModernInvoice.java +++ b/src/main/java/com/demcha/compose/document/templates/invoice/presets/ModernInvoice.java @@ -20,10 +20,14 @@ */ public final class ModernInvoice { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "modern-invoice"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Modern Invoice"; private ModernInvoice() { diff --git a/src/main/java/com/demcha/compose/document/templates/invoice/spec/InvoiceSpec.java b/src/main/java/com/demcha/compose/document/templates/invoice/spec/InvoiceSpec.java index 38cd6db43..866fc594b 100644 --- a/src/main/java/com/demcha/compose/document/templates/invoice/spec/InvoiceSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/invoice/spec/InvoiceSpec.java @@ -118,8 +118,8 @@ public record LineItem(String description, String details, * One summary row (subtotal, tax, total, etc.) appearing beneath * the line item table. * - * @param label row label - * @param value row value + * @param label row label + * @param value row value * @param isTotal whether this row is the headline total (rendered * emphasised by the preset) */ @@ -187,56 +187,87 @@ private Builder() { * @param value invoice number * @return this builder */ - public Builder invoiceNumber(String value) { this.invoiceNumber = value; return this; } + public Builder invoiceNumber(String value) { + this.invoiceNumber = value; + return this; + } + /** * Sets the issue date. * * @param value issue date * @return this builder */ - public Builder issueDate(String value) { this.issueDate = value; return this; } + public Builder issueDate(String value) { + this.issueDate = value; + return this; + } + /** * Sets the due date. * * @param value due date * @return this builder */ - public Builder dueDate(String value) { this.dueDate = value == null ? "" : value; return this; } + public Builder dueDate(String value) { + this.dueDate = value == null ? "" : value; + return this; + } + /** * Sets the sender party. * * @param value sender party * @return this builder */ - public Builder fromParty(Party value) { this.fromParty = value; return this; } + public Builder fromParty(Party value) { + this.fromParty = value; + return this; + } + /** * Sets the recipient party. * * @param value recipient party * @return this builder */ - public Builder billToParty(Party value) { this.billToParty = value; return this; } + public Builder billToParty(Party value) { + this.billToParty = value; + return this; + } + /** * Adds a line item. * * @param item line item * @return this builder */ - public Builder lineItem(LineItem item) { this.lineItems.add(item); return this; } + public Builder lineItem(LineItem item) { + this.lineItems.add(item); + return this; + } + /** * Adds a summary row. * * @param row summary row * @return this builder */ - public Builder summaryRow(SummaryRow row) { this.summaryRows.add(row); return this; } + public Builder summaryRow(SummaryRow row) { + this.summaryRows.add(row); + return this; + } + /** * Adds a footer note. * * @param note footer note * @return this builder */ - public Builder note(String note) { if (note != null) this.notes.add(note); return this; } + public Builder note(String note) { + if (note != null) this.notes.add(note); + return this; + } /** * Builds an immutable {@link InvoiceSpec}. diff --git a/src/main/java/com/demcha/compose/document/templates/proposal/presets/ModernProposal.java b/src/main/java/com/demcha/compose/document/templates/proposal/presets/ModernProposal.java index 291c138e0..91e077bf2 100644 --- a/src/main/java/com/demcha/compose/document/templates/proposal/presets/ModernProposal.java +++ b/src/main/java/com/demcha/compose/document/templates/proposal/presets/ModernProposal.java @@ -21,10 +21,14 @@ */ public final class ModernProposal { - /** Stable template identifier. */ + /** + * Stable template identifier. + */ public static final String ID = "modern-proposal"; - /** Human-readable display name. */ + /** + * Human-readable display name. + */ public static final String DISPLAY_NAME = "Modern Proposal"; private ModernProposal() { diff --git a/src/main/java/com/demcha/compose/document/templates/proposal/spec/ProposalSpec.java b/src/main/java/com/demcha/compose/document/templates/proposal/spec/ProposalSpec.java index ade8e6c0d..d6199f80f 100644 --- a/src/main/java/com/demcha/compose/document/templates/proposal/spec/ProposalSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/proposal/spec/ProposalSpec.java @@ -91,10 +91,10 @@ public record Section(String heading, String body) { * One pricing row — label + value pair appearing in the pricing * summary block. * - * @param label row label (e.g. "Discovery workshop") - * @param value row value (e.g. "GBP 1,450") - * @param isHeadline whether this row is the headline total - * (rendered emphasised by the preset) + * @param label row label (e.g. "Discovery workshop") + * @param value row value (e.g. "GBP 1,450") + * @param isHeadline whether this row is the headline total + * (rendered emphasised by the preset) */ public record PricingRow(String label, String value, boolean isHeadline) { @@ -158,42 +158,65 @@ private Builder() { * @param value title * @return this builder */ - public Builder title(String value) { this.title = value; return this; } + public Builder title(String value) { + this.title = value; + return this; + } + /** * Sets the sender party. * * @param value sender party * @return this builder */ - public Builder fromParty(Party value) { this.fromParty = value; return this; } + public Builder fromParty(Party value) { + this.fromParty = value; + return this; + } + /** * Sets the receiving party. * * @param value receiving party * @return this builder */ - public Builder toParty(Party value) { this.toParty = value; return this; } + public Builder toParty(Party value) { + this.toParty = value; + return this; + } + /** * Adds a content section. * * @param section content section * @return this builder */ - public Builder section(Section section) { this.sections.add(section); return this; } + public Builder section(Section section) { + this.sections.add(section); + return this; + } + /** * Adds a pricing row. * * @param row pricing row * @return this builder */ - public Builder pricingRow(PricingRow row) { this.pricingRows.add(row); return this; } + public Builder pricingRow(PricingRow row) { + this.pricingRows.add(row); + return this; + } + /** * Sets the footer note. * * @param note footer note * @return this builder */ - public Builder footerNote(String note) { this.footerNote = note == null ? "" : note; return this; } + public Builder footerNote(String note) { + this.footerNote = note == null ? "" : note; + return this; + } /** * Builds an immutable {@link ProposalSpec}. diff --git a/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentSceneStyles.java b/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentSceneStyles.java index 4f2428e86..0d3297a51 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentSceneStyles.java +++ b/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentSceneStyles.java @@ -1,10 +1,8 @@ package com.demcha.compose.document.templates.support.business; -import com.demcha.compose.document.templates.support.common.*; - import com.demcha.compose.engine.components.content.text.TextStyle; -import java.awt.Color; +import java.awt.*; /** * Lightweight style collaborator for invoice and proposal scene composers. diff --git a/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentStyles.java b/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentStyles.java index 7fcb7315d..a08f3f32b 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentStyles.java +++ b/src/main/java/com/demcha/compose/document/templates/support/business/BusinessDocumentStyles.java @@ -1,12 +1,10 @@ package com.demcha.compose.document.templates.support.business; -import com.demcha.compose.document.templates.support.common.*; - -import com.demcha.compose.font.FontName; import com.demcha.compose.engine.components.content.text.TextDecoration; import com.demcha.compose.engine.components.content.text.TextStyle; +import com.demcha.compose.font.FontName; -import java.awt.Color; +import java.awt.*; final class BusinessDocumentStyles { static final Color TITLE_COLOR = new Color(21, 46, 86); diff --git a/src/main/java/com/demcha/compose/document/templates/support/business/InvoiceTemplateComposer.java b/src/main/java/com/demcha/compose/document/templates/support/business/InvoiceTemplateComposer.java index d41d8b03d..2a304c0a1 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/business/InvoiceTemplateComposer.java +++ b/src/main/java/com/demcha/compose/document/templates/support/business/InvoiceTemplateComposer.java @@ -1,35 +1,19 @@ package com.demcha.compose.document.templates.support.business; import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.templates.data.invoice.InvoiceData; -import com.demcha.compose.document.templates.data.invoice.InvoiceDocumentSpec; -import com.demcha.compose.document.templates.data.invoice.InvoiceLineItem; -import com.demcha.compose.document.templates.data.invoice.InvoiceParty; -import com.demcha.compose.document.templates.data.invoice.InvoiceSummaryRow; -import com.demcha.compose.document.templates.support.common.TemplateColumnSpec; -import com.demcha.compose.document.templates.support.common.TemplateComposeTarget; -import com.demcha.compose.document.templates.support.common.TemplateDividerSpec; -import com.demcha.compose.document.templates.support.common.TemplateLayoutPolicy; -import com.demcha.compose.document.templates.support.common.TemplateModuleBlock; -import com.demcha.compose.document.templates.support.common.TemplateModuleSpec; -import com.demcha.compose.document.templates.support.common.TemplateParagraphSpec; -import com.demcha.compose.document.templates.support.common.TemplateRowSpec; -import com.demcha.compose.document.templates.support.common.TemplateSceneSupport; -import com.demcha.compose.document.templates.support.common.TemplateTableSpec; +import com.demcha.compose.document.templates.data.invoice.*; +import com.demcha.compose.document.templates.support.common.*; +import com.demcha.compose.engine.components.content.shape.Stroke; import com.demcha.compose.engine.components.content.table.TableCellContent; import com.demcha.compose.engine.components.content.table.TableCellLayoutStyle; import com.demcha.compose.engine.components.content.table.TableColumnLayout; -import com.demcha.compose.engine.components.content.shape.Stroke; import com.demcha.compose.engine.components.layout.Anchor; import com.demcha.compose.engine.components.style.Margin; import com.demcha.compose.engine.components.style.Padding; -import java.awt.Color; -import java.util.ArrayList; -import java.util.LinkedHashMap; +import java.awt.*; +import java.util.*; import java.util.List; -import java.util.Map; -import java.util.Objects; /** * Shared scene composer for the invoice template. @@ -59,7 +43,7 @@ public InvoiceTemplateComposer(BusinessDocumentSceneStyles styles) { * Emits invoice header, parties, line items, notes, totals, and footer modules. * * @param target canonical template compose target - * @param spec invoice document spec + * @param spec invoice document spec */ public void compose(TemplateComposeTarget target, InvoiceDocumentSpec spec) { InvoiceData safe = Objects.requireNonNull(spec, "spec").invoice(); @@ -316,8 +300,8 @@ private TemplateTableSpec summaryTable(InvoiceData data) { for (int row = 0; row < rows.size(); row++) { if (rows.get(row).emphasized()) { rowStyles.put(row, TableCellLayoutStyle.builder() - .textStyle(styles.bodyBoldStyle(BODY_SIZE)) - .build()); + .textStyle(styles.bodyBoldStyle(BODY_SIZE)) + .build()); } } Map columnStyles = new LinkedHashMap<>(); diff --git a/src/main/java/com/demcha/compose/document/templates/support/business/ProposalTemplateComposer.java b/src/main/java/com/demcha/compose/document/templates/support/business/ProposalTemplateComposer.java index 4d97680e3..875d3f199 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/business/ProposalTemplateComposer.java +++ b/src/main/java/com/demcha/compose/document/templates/support/business/ProposalTemplateComposer.java @@ -1,28 +1,19 @@ package com.demcha.compose.document.templates.support.business; -import com.demcha.compose.document.templates.support.common.*; - import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.templates.data.proposal.ProposalData; -import com.demcha.compose.document.templates.data.proposal.ProposalDocumentSpec; -import com.demcha.compose.document.templates.data.proposal.ProposalParty; -import com.demcha.compose.document.templates.data.proposal.ProposalPricingRow; -import com.demcha.compose.document.templates.data.proposal.ProposalSection; -import com.demcha.compose.document.templates.data.proposal.ProposalTimelineItem; +import com.demcha.compose.document.templates.data.proposal.*; +import com.demcha.compose.document.templates.support.common.*; +import com.demcha.compose.engine.components.content.shape.Stroke; import com.demcha.compose.engine.components.content.table.TableCellContent; import com.demcha.compose.engine.components.content.table.TableCellLayoutStyle; import com.demcha.compose.engine.components.content.table.TableColumnLayout; -import com.demcha.compose.engine.components.content.shape.Stroke; import com.demcha.compose.engine.components.layout.Anchor; import com.demcha.compose.engine.components.style.Margin; import com.demcha.compose.engine.components.style.Padding; -import java.awt.Color; -import java.util.ArrayList; -import java.util.LinkedHashMap; +import java.awt.*; +import java.util.*; import java.util.List; -import java.util.Map; -import java.util.Objects; /** * Shared scene composer for the proposal template. @@ -54,7 +45,7 @@ public ProposalTemplateComposer(BusinessDocumentSceneStyles styles) { * Emits proposal header, sections, timeline, pricing, acceptance, and footer modules. * * @param target canonical template compose target - * @param spec proposal document spec + * @param spec proposal document spec */ public void compose(TemplateComposeTarget target, ProposalDocumentSpec spec) { ProposalData safe = Objects.requireNonNull(spec, "spec").proposal(); diff --git a/src/main/java/com/demcha/compose/document/templates/support/business/package-info.java b/src/main/java/com/demcha/compose/document/templates/support/business/package-info.java index b74bdba68..48e5950fb 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/business/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/support/business/package-info.java @@ -3,4 +3,3 @@ */ package com.demcha.compose.document.templates.support.business; -import com.demcha.compose.document.templates.support.common.*; diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/SessionTemplateComposeTarget.java b/src/main/java/com/demcha/compose/document/templates/support/common/SessionTemplateComposeTarget.java index 14e80a737..95f1f4336 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/SessionTemplateComposeTarget.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/SessionTemplateComposeTarget.java @@ -1,12 +1,7 @@ package com.demcha.compose.document.templates.support.common; import com.demcha.compose.document.api.DocumentSession; -import com.demcha.compose.document.dsl.AbstractFlowBuilder; -import com.demcha.compose.document.dsl.DocumentDsl; -import com.demcha.compose.document.dsl.ModuleBuilder; -import com.demcha.compose.document.dsl.PageFlowBuilder; -import com.demcha.compose.document.dsl.RowBuilder; -import com.demcha.compose.document.dsl.TableBuilder; +import com.demcha.compose.document.dsl.*; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.table.DocumentTableColumn; diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateColumnSpec.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateColumnSpec.java index 5366581cb..9688e2717 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateColumnSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateColumnSpec.java @@ -4,16 +4,15 @@ import com.demcha.compose.engine.components.style.Padding; import java.util.List; -import java.util.Objects; /** * One vertical column inside a template row. * - * @param name semantic column name - * @param blocks blocks rendered top-to-bottom inside the column + * @param name semantic column name + * @param blocks blocks rendered top-to-bottom inside the column * @param spacing vertical spacing between blocks * @param padding inner column padding - * @param margin outer column margin + * @param margin outer column margin */ public record TemplateColumnSpec( String name, @@ -38,8 +37,8 @@ public record TemplateColumnSpec( /** * Creates a zero-padding, zero-margin column. * - * @param name semantic column name - * @param blocks column body blocks + * @param name semantic column name + * @param blocks column body blocks * @param spacing vertical spacing between blocks * @return column specification */ @@ -50,9 +49,9 @@ public static TemplateColumnSpec of(String name, List block /** * Creates a zero-padding, zero-margin column from varargs blocks. * - * @param name semantic column name + * @param name semantic column name * @param spacing vertical spacing between blocks - * @param blocks column body blocks + * @param blocks column body blocks * @return column specification */ public static TemplateColumnSpec of(String name, double spacing, TemplateModuleBlock... blocks) { diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateComposeTarget.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateComposeTarget.java index d411bb2e6..190ccf76a 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateComposeTarget.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateComposeTarget.java @@ -32,7 +32,7 @@ public interface TemplateComposeTarget { * Starts one root document flow. * * @param rootName semantic root name - * @param spacing vertical spacing between top-level blocks + * @param spacing vertical spacing between top-level blocks */ void startDocument(String rootName, double spacing); diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDividerSpec.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDividerSpec.java index 87a5fd5f8..8bb36c4b2 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDividerSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDividerSpec.java @@ -2,16 +2,16 @@ import com.demcha.compose.engine.components.style.Margin; -import java.awt.Color; +import java.awt.*; /** * Immutable divider instruction used by shared template scene composers. * - * @param name semantic divider name used in snapshots - * @param width divider width in points + * @param name semantic divider name used in snapshots + * @param width divider width in points * @param thickness divider stroke thickness in points - * @param color divider color - * @param margin outer divider margin + * @param color divider color + * @param margin outer divider margin */ public record TemplateDividerSpec( String name, diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDocumentAdapters.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDocumentAdapters.java index b16fb59d7..957a4a1ff 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDocumentAdapters.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateDocumentAdapters.java @@ -1,11 +1,6 @@ package com.demcha.compose.document.templates.support.common; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextIndent; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableCell; import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLayoutPolicy.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLayoutPolicy.java index 6a40d3c13..d19f38b61 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLayoutPolicy.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLayoutPolicy.java @@ -3,8 +3,6 @@ import com.demcha.compose.engine.components.style.Margin; import com.demcha.compose.engine.components.style.Padding; -import java.util.Objects; - /** * Shared rhythm tokens for canonical template scene composers. * @@ -12,20 +10,20 @@ * spacing, and reusable cell padding in one support-level object so built-in * templates do not hide layout rules in scattered local constants.

* - * @param rootSpacing spacing between top-level blocks in the root flow - * @param sectionMargin margin applied to section/module headings - * @param subsectionMargin margin applied to nested section blocks - * @param blockMargin margin applied to regular body blocks when a template - * needs an explicit top gap - * @param bodyLineSpacing extra spacing between wrapped body text lines - * @param bodyItemSpacing extra spacing between list items - * @param tableLineSpacing extra spacing between multiple text lines inside - * table cells + * @param rootSpacing spacing between top-level blocks in the root flow + * @param sectionMargin margin applied to section/module headings + * @param subsectionMargin margin applied to nested section blocks + * @param blockMargin margin applied to regular body blocks when a template + * needs an explicit top gap + * @param bodyLineSpacing extra spacing between wrapped body text lines + * @param bodyItemSpacing extra spacing between list items + * @param tableLineSpacing extra spacing between multiple text lines inside + * table cells * @param markerlessContinuationIndent prefix used for wrapped continuation * lines in markerless rows - * @param bodyPadding default body block padding - * @param compactCellPadding reusable padding for compact table cells - * @param contentCellPadding reusable padding for content-heavy table cells + * @param bodyPadding default body block padding + * @param compactCellPadding reusable padding for compact table cells + * @param contentCellPadding reusable padding for content-heavy table cells * @author Artem Demchyshyn */ public record TemplateLayoutPolicy( @@ -112,10 +110,10 @@ public Margin top(double value) { /** * Creates a full margin after validating each spacing value. * - * @param top top margin - * @param right right margin + * @param top top margin + * @param right right margin * @param bottom bottom margin - * @param left left margin + * @param left left margin * @return validated margin */ public Margin margin(double top, double right, double bottom, double left) { diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLifecycleLog.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLifecycleLog.java index 23df5cd5d..08d838012 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLifecycleLog.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateLifecycleLog.java @@ -22,7 +22,7 @@ private TemplateLifecycleLog() { * Records the start of one template composition pass. * * @param templateId stable template identifier - * @param spec template specification object + * @param spec template specification object * @return monotonic start time used by {@link #success(String, Object, long)} */ public static long start(String templateId, Object spec) { @@ -35,7 +35,7 @@ public static long start(String templateId, Object spec) { * Records successful completion of one template composition pass. * * @param templateId stable template identifier - * @param spec template specification object + * @param spec template specification object * @param startNanos monotonic start time returned by {@link #start(String, Object)} */ public static void success(String templateId, Object spec, long startNanos) { @@ -50,9 +50,9 @@ public static void success(String templateId, Object spec, long startNanos) { * Records a failed template composition pass without logging user content. * * @param templateId stable template identifier - * @param spec template specification object + * @param spec template specification object * @param startNanos monotonic start time returned by {@link #start(String, Object)} - * @param failure failure raised during template composition + * @param failure failure raised during template composition */ public static void failure(String templateId, Object spec, long startNanos, Throwable failure) { LOG.debug( @@ -81,7 +81,7 @@ public static long moduleStart(TemplateModuleSpec module) { /** * Records successful completion of one template module composition pass. * - * @param module module specification + * @param module module specification * @param startNanos monotonic start time returned by {@link #moduleStart(TemplateModuleSpec)} */ public static void moduleSuccess(TemplateModuleSpec module, long startNanos) { @@ -95,9 +95,9 @@ public static void moduleSuccess(TemplateModuleSpec module, long startNanos) { /** * Records a failed template module composition pass without logging user content. * - * @param module module specification + * @param module module specification * @param startNanos monotonic start time returned by {@link #moduleStart(TemplateModuleSpec)} - * @param failure failure raised during module composition + * @param failure failure raised during module composition */ public static void moduleFailure(TemplateModuleSpec module, long startNanos, Throwable failure) { LOG.debug( diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateListSpec.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateListSpec.java index c217f6a6b..21d245799 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateListSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateListSpec.java @@ -12,17 +12,17 @@ /** * Immutable list instruction used by shared template scene composers. * - * @param name semantic list name used in snapshots and layout graph paths - * @param items list item texts in source order - * @param marker marker rendered before each item - * @param style shared item text style - * @param align horizontal item alignment - * @param lineSpacing extra spacing between wrapped lines in one item - * @param itemSpacing extra spacing between list items + * @param name semantic list name used in snapshots and layout graph paths + * @param items list item texts in source order + * @param marker marker rendered before each item + * @param style shared item text style + * @param align horizontal item alignment + * @param lineSpacing extra spacing between wrapped lines in one item + * @param itemSpacing extra spacing between list items * @param continuationIndent prefix used only for wrapped continuation lines when marker is hidden - * @param normalizeMarkers whether input items may include pre-existing markers - * @param padding list padding - * @param margin list margin + * @param normalizeMarkers whether input items may include pre-existing markers + * @param padding list padding + * @param margin list margin * @author Artem Demchyshyn */ public record TemplateListSpec( diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateModuleSpec.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateModuleSpec.java index 4e0924a62..3430f5ac4 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateModuleSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateModuleSpec.java @@ -10,9 +10,9 @@ * without introducing a new layout primitive or changing pagination * semantics.

* - * @param name semantic module name used in diagnostics and graph-oriented - * tooling - * @param title optional module title paragraph, or {@code null} when omitted + * @param name semantic module name used in diagnostics and graph-oriented + * tooling + * @param title optional module title paragraph, or {@code null} when omitted * @param blocks ordered body blocks rendered after the title * @author Artem Demchyshyn */ diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateParagraphSpec.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateParagraphSpec.java index 91feb2bcd..843187b89 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateParagraphSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateParagraphSpec.java @@ -13,17 +13,17 @@ /** * Immutable paragraph instruction used by shared template scene composers. * - * @param name semantic paragraph name used in snapshots - * @param text paragraph text when inline runs are not supplied + * @param name semantic paragraph name used in snapshots + * @param text paragraph text when inline runs are not supplied * @param inlineTextRuns optional styled inline runs in source order - * @param style paragraph text style - * @param align horizontal text alignment - * @param lineSpacing extra space between wrapped lines - * @param bulletOffset first-line prefix for list-like paragraph paths + * @param style paragraph text style + * @param align horizontal text alignment + * @param lineSpacing extra space between wrapped lines + * @param bulletOffset first-line prefix for list-like paragraph paths * @param indentStrategy hanging/first-line indent strategy - * @param linkOptions optional paragraph link metadata - * @param padding inner padding - * @param margin outer margin + * @param linkOptions optional paragraph link metadata + * @param padding inner padding + * @param margin outer margin * @author Artem Demchyshyn */ public record TemplateParagraphSpec( @@ -57,16 +57,16 @@ public record TemplateParagraphSpec( /** * Creates a paragraph instruction from plain text. * - * @param name semantic paragraph name - * @param text paragraph text - * @param style paragraph text style - * @param align horizontal text alignment - * @param lineSpacing extra line spacing - * @param bulletOffset first-line marker or prefix + * @param name semantic paragraph name + * @param text paragraph text + * @param style paragraph text style + * @param align horizontal text alignment + * @param lineSpacing extra line spacing + * @param bulletOffset first-line marker or prefix * @param indentStrategy text indent strategy - * @param linkOptions optional link metadata - * @param padding inner padding - * @param margin outer margin + * @param linkOptions optional link metadata + * @param padding inner padding + * @param margin outer margin */ public TemplateParagraphSpec(String name, String text, diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateRowSpec.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateRowSpec.java index 0fee02e39..206f12437 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateRowSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateRowSpec.java @@ -8,12 +8,12 @@ /** * Horizontal row instruction for canonical template scene composers. * - * @param name semantic row name + * @param name semantic row name * @param columns vertical sections rendered left-to-right * @param weights optional per-column width weights - * @param gap horizontal gap between columns + * @param gap horizontal gap between columns * @param padding inner row padding - * @param margin outer row margin + * @param margin outer row margin */ public record TemplateRowSpec( String name, @@ -48,10 +48,10 @@ public record TemplateRowSpec( /** * Creates a weighted row with zero padding and margin. * - * @param name semantic row name + * @param name semantic row name * @param columns row columns * @param weights per-column weights - * @param gap horizontal gap + * @param gap horizontal gap * @return row specification */ public static TemplateRowSpec weighted(String name, List columns, List weights, double gap) { diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateSceneSupport.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateSceneSupport.java index 37d705211..e9af0800c 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateSceneSupport.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateSceneSupport.java @@ -9,7 +9,7 @@ import com.demcha.compose.engine.components.style.Margin; import com.demcha.compose.engine.components.style.Padding; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -26,13 +26,13 @@ private TemplateSceneSupport() { /** * Creates a normalized paragraph instruction. * - * @param name semantic paragraph name - * @param text paragraph text - * @param style text style - * @param align horizontal alignment + * @param name semantic paragraph name + * @param text paragraph text + * @param style text style + * @param align horizontal alignment * @param lineSpacing extra line spacing - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin * @return paragraph instruction */ public static TemplateParagraphSpec paragraph(String name, @@ -48,14 +48,14 @@ public static TemplateParagraphSpec paragraph(String name, /** * Creates a normalized paragraph instruction with optional hyperlink metadata. * - * @param name semantic paragraph name - * @param text paragraph text - * @param style text style - * @param align horizontal alignment + * @param name semantic paragraph name + * @param text paragraph text + * @param style text style + * @param align horizontal alignment * @param lineSpacing extra line spacing * @param linkOptions optional link metadata - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin * @return paragraph instruction */ public static TemplateParagraphSpec paragraph(String name, @@ -72,13 +72,13 @@ public static TemplateParagraphSpec paragraph(String name, /** * Creates a normalized paragraph instruction from inline text runs. * - * @param name semantic paragraph name - * @param inlineRuns inline text runs - * @param style fallback text style - * @param align horizontal alignment + * @param name semantic paragraph name + * @param inlineRuns inline text runs + * @param style fallback text style + * @param align horizontal alignment * @param lineSpacing extra line spacing - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin * @return paragraph instruction */ public static TemplateParagraphSpec inlineParagraph(String name, @@ -94,15 +94,15 @@ public static TemplateParagraphSpec inlineParagraph(String name, /** * Creates a normalized paragraph instruction with legacy block-indent semantics. * - * @param name semantic paragraph name - * @param text paragraph text - * @param style text style - * @param align horizontal alignment - * @param lineSpacing extra line spacing - * @param bulletOffset first-line marker or prefix + * @param name semantic paragraph name + * @param text paragraph text + * @param style text style + * @param align horizontal alignment + * @param lineSpacing extra line spacing + * @param bulletOffset first-line marker or prefix * @param indentStrategy text indent strategy - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin * @return paragraph instruction */ public static TemplateParagraphSpec blockParagraph(String name, @@ -121,16 +121,16 @@ public static TemplateParagraphSpec blockParagraph(String name, * Creates a normalized paragraph instruction with legacy block-indent semantics * and optional hyperlink metadata. * - * @param name semantic paragraph name - * @param text paragraph text - * @param style text style - * @param align horizontal alignment - * @param lineSpacing extra line spacing - * @param bulletOffset first-line marker or prefix + * @param name semantic paragraph name + * @param text paragraph text + * @param style text style + * @param align horizontal alignment + * @param lineSpacing extra line spacing + * @param bulletOffset first-line marker or prefix * @param indentStrategy text indent strategy - * @param linkOptions optional link metadata - * @param padding inner padding - * @param margin outer margin + * @param linkOptions optional link metadata + * @param padding inner padding + * @param margin outer margin * @return paragraph instruction */ public static TemplateParagraphSpec blockParagraph(String name, @@ -149,15 +149,15 @@ public static TemplateParagraphSpec blockParagraph(String name, /** * Creates a normalized list instruction. * - * @param name semantic list name - * @param items list items - * @param marker list marker - * @param style item text style - * @param align horizontal alignment + * @param name semantic list name + * @param items list items + * @param marker list marker + * @param style item text style + * @param align horizontal alignment * @param lineSpacing extra wrapped-line spacing * @param itemSpacing extra space between items - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin * @return list instruction */ public static TemplateListSpec list(String name, @@ -175,16 +175,16 @@ public static TemplateListSpec list(String name, /** * Creates a normalized list instruction with markerless continuation indentation. * - * @param name semantic list name - * @param items list items - * @param marker list marker - * @param style item text style - * @param align horizontal alignment - * @param lineSpacing extra wrapped-line spacing - * @param itemSpacing extra space between items + * @param name semantic list name + * @param items list items + * @param marker list marker + * @param style item text style + * @param align horizontal alignment + * @param lineSpacing extra wrapped-line spacing + * @param itemSpacing extra space between items * @param continuationIndent markerless continuation indent text - * @param padding inner padding - * @param margin outer margin + * @param padding inner padding + * @param margin outer margin * @return list instruction */ public static TemplateListSpec list(String name, @@ -214,11 +214,11 @@ public static TemplateListSpec list(String name, /** * Creates a normalized divider instruction. * - * @param name semantic divider name - * @param width divider width + * @param name semantic divider name + * @param width divider width * @param thickness divider thickness - * @param color divider color - * @param margin outer margin + * @param color divider color + * @param margin outer margin * @return divider instruction */ public static TemplateDividerSpec divider(String name, @@ -233,7 +233,7 @@ public static TemplateDividerSpec divider(String name, * Joins non-blank values with the supplied delimiter. * * @param delimiter delimiter between values - * @param values values to join + * @param values values to join * @return joined text */ public static String joinNonBlank(String delimiter, String... values) { @@ -298,14 +298,14 @@ public static String stripBasicMarkdown(String value) { /** * Appends a simple section header composed of a heading paragraph and a rule. * - * @param target active template compose target - * @param prefix semantic node name prefix - * @param title section title - * @param titleStyle title text style - * @param ruleWidth divider width - * @param ruleColor divider color + * @param target active template compose target + * @param prefix semantic node name prefix + * @param title section title + * @param titleStyle title text style + * @param ruleWidth divider width + * @param ruleColor divider color * @param ruleThickness divider thickness - * @param margin header margin + * @param margin header margin */ public static void addSectionHeader(TemplateComposeTarget target, String prefix, diff --git a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateTableSpec.java b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateTableSpec.java index dca7b9f7e..4082c1b84 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/common/TemplateTableSpec.java +++ b/src/main/java/com/demcha/compose/document/templates/support/common/TemplateTableSpec.java @@ -12,15 +12,15 @@ /** * Immutable table instruction used by shared template scene composers. * - * @param name semantic table name used in snapshots - * @param columns negotiated table columns - * @param rows table rows in source order + * @param name semantic table name used in snapshots + * @param columns negotiated table columns + * @param rows table rows in source order * @param defaultCellStyle default style applied to cells without overrides - * @param rowStyles row-specific style overrides - * @param columnStyles column-specific style overrides - * @param width resolved table width - * @param padding outer table padding - * @param margin outer table margin + * @param rowStyles row-specific style overrides + * @param columnStyles column-specific style overrides + * @param width resolved table width + * @param padding outer table padding + * @param margin outer table margin */ public record TemplateTableSpec( String name, diff --git a/src/main/java/com/demcha/compose/document/templates/support/schedule/WeeklyScheduleTemplateComposer.java b/src/main/java/com/demcha/compose/document/templates/support/schedule/WeeklyScheduleTemplateComposer.java index cfc878d9a..2839cd0d6 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/schedule/WeeklyScheduleTemplateComposer.java +++ b/src/main/java/com/demcha/compose/document/templates/support/schedule/WeeklyScheduleTemplateComposer.java @@ -1,32 +1,22 @@ package com.demcha.compose.document.templates.support.schedule; -import com.demcha.compose.document.templates.support.common.*; - import com.demcha.compose.document.node.TextAlign; -import com.demcha.compose.document.templates.data.schedule.ScheduleAssignment; -import com.demcha.compose.document.templates.data.schedule.ScheduleCategory; -import com.demcha.compose.document.templates.data.schedule.ScheduleDay; -import com.demcha.compose.document.templates.data.schedule.ScheduleMetricRow; -import com.demcha.compose.document.templates.data.schedule.SchedulePerson; -import com.demcha.compose.document.templates.data.schedule.ScheduleSlot; -import com.demcha.compose.document.templates.data.schedule.WeeklyScheduleData; -import com.demcha.compose.document.templates.data.schedule.WeeklyScheduleDocumentSpec; +import com.demcha.compose.document.templates.data.schedule.*; +import com.demcha.compose.document.templates.support.common.TemplateComposeTarget; +import com.demcha.compose.document.templates.support.common.TemplateSceneSupport; +import com.demcha.compose.document.templates.support.common.TemplateTableSpec; import com.demcha.compose.document.templates.theme.WeeklyScheduleTheme; +import com.demcha.compose.engine.components.content.shape.Stroke; import com.demcha.compose.engine.components.content.table.TableCellContent; import com.demcha.compose.engine.components.content.table.TableCellLayoutStyle; import com.demcha.compose.engine.components.content.table.TableColumnLayout; -import com.demcha.compose.engine.components.content.shape.Stroke; import com.demcha.compose.engine.components.layout.Anchor; import com.demcha.compose.engine.components.style.Margin; import com.demcha.compose.engine.components.style.Padding; -import java.awt.Color; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.LinkedHashMap; +import java.awt.*; +import java.util.*; import java.util.List; -import java.util.Map; -import java.util.Objects; /** * Shared scene composer for the weekly schedule template. @@ -48,7 +38,7 @@ public WeeklyScheduleTemplateComposer(WeeklyScheduleTheme theme) { * Emits the weekly schedule header, day bands, roster matrix, and footer notes. * * @param target canonical template compose target - * @param spec weekly schedule document spec + * @param spec weekly schedule document spec */ public void compose(TemplateComposeTarget target, WeeklyScheduleDocumentSpec spec) { WeeklyScheduleData safe = Objects.requireNonNull(spec, "spec").schedule(); diff --git a/src/main/java/com/demcha/compose/document/templates/support/schedule/package-info.java b/src/main/java/com/demcha/compose/document/templates/support/schedule/package-info.java index 92fa047d6..20977fbea 100644 --- a/src/main/java/com/demcha/compose/document/templates/support/schedule/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/support/schedule/package-info.java @@ -3,4 +3,3 @@ */ package com.demcha.compose.document.templates.support.schedule; -import com.demcha.compose.document.templates.support.common.*; diff --git a/src/main/java/com/demcha/compose/document/templates/theme/WeeklyScheduleTheme.java b/src/main/java/com/demcha/compose/document/templates/theme/WeeklyScheduleTheme.java index df33b51c2..c3409269c 100644 --- a/src/main/java/com/demcha/compose/document/templates/theme/WeeklyScheduleTheme.java +++ b/src/main/java/com/demcha/compose/document/templates/theme/WeeklyScheduleTheme.java @@ -1,38 +1,38 @@ package com.demcha.compose.document.templates.theme; -import com.demcha.compose.font.FontName; import com.demcha.compose.engine.components.content.text.TextDecoration; import com.demcha.compose.engine.components.content.text.TextStyle; +import com.demcha.compose.font.FontName; -import java.awt.Color; +import java.awt.*; /** * Shared visual tokens for weekly schedule templates. * - * @param titleColor title text color - * @param accentColor accent color - * @param bodyColor body text color - * @param mutedTextColor muted text color - * @param gridBorderColor grid border color - * @param bandFillColor header band fill color - * @param nameColumnFillColor name column fill color - * @param emptyCellFillColor empty cell fill color - * @param titleFont title font family - * @param bodyFont body font family - * @param titleFontSize title font size - * @param weekLabelFontSize week label font size - * @param dayLabelFontSize day label font size - * @param noteFontSize note font size - * @param metricFontSize metric font size - * @param personNameFontSize person name font size - * @param cellFontSize schedule cell font size - * @param footerFontSize footer font size - * @param rootSpacing spacing between root blocks - * @param sectionSpacing spacing between sections - * @param nameColumnWidth width of the fixed name column - * @param bandPaddingVertical vertical padding for header bands + * @param titleColor title text color + * @param accentColor accent color + * @param bodyColor body text color + * @param mutedTextColor muted text color + * @param gridBorderColor grid border color + * @param bandFillColor header band fill color + * @param nameColumnFillColor name column fill color + * @param emptyCellFillColor empty cell fill color + * @param titleFont title font family + * @param bodyFont body font family + * @param titleFontSize title font size + * @param weekLabelFontSize week label font size + * @param dayLabelFontSize day label font size + * @param noteFontSize note font size + * @param metricFontSize metric font size + * @param personNameFontSize person name font size + * @param cellFontSize schedule cell font size + * @param footerFontSize footer font size + * @param rootSpacing spacing between root blocks + * @param sectionSpacing spacing between sections + * @param nameColumnWidth width of the fixed name column + * @param bandPaddingVertical vertical padding for header bands * @param bandPaddingHorizontal horizontal padding for header bands - * @param bodyPaddingVertical vertical body padding + * @param bodyPaddingVertical vertical body padding * @param bodyPaddingHorizontal horizontal body padding */ public record WeeklyScheduleTheme( diff --git a/src/main/java/com/demcha/compose/document/templates/themes/Spacing.java b/src/main/java/com/demcha/compose/document/templates/themes/Spacing.java index ec149e005..64ab45df2 100644 --- a/src/main/java/com/demcha/compose/document/templates/themes/Spacing.java +++ b/src/main/java/com/demcha/compose/document/templates/themes/Spacing.java @@ -43,7 +43,7 @@ public record Spacing( * numeric token, and rejects {@code null} {@code contentPadding}. * * @throws IllegalArgumentException if any numeric token is negative, - * {@code NaN}, or infinite + * {@code NaN}, or infinite * @throws NullPointerException if {@code contentPadding} is {@code null} */ public Spacing { diff --git a/src/main/java/com/demcha/compose/document/templates/themes/Typography.java b/src/main/java/com/demcha/compose/document/templates/themes/Typography.java index dacbe7b1e..342ee4267 100644 --- a/src/main/java/com/demcha/compose/document/templates/themes/Typography.java +++ b/src/main/java/com/demcha/compose/document/templates/themes/Typography.java @@ -16,14 +16,14 @@ *

Five built-in presets cover the common sans-serif / serif / monospace * / display combinations; use {@link #builder()} for fully custom typography.

* - * @param headerFont font name applied to the document name and section headings - * @param bodyFont font name applied to body text and list items - * @param nameSize type size for the top-of-document name (largest) - * @param headingSize type size for primary section headings - * @param subHeadingSize type size for secondary headings (e.g. role titles) - * @param bodySize type size for paragraph body text - * @param smallBodySize type size for compact body text (contact lines, captions) - * @param captionSize type size for the smallest auxiliary text + * @param headerFont font name applied to the document name and section headings + * @param bodyFont font name applied to body text and list items + * @param nameSize type size for the top-of-document name (largest) + * @param headingSize type size for primary section headings + * @param subHeadingSize type size for secondary headings (e.g. role titles) + * @param bodySize type size for paragraph body text + * @param smallBodySize type size for compact body text (contact lines, captions) + * @param captionSize type size for the smallest auxiliary text */ public record Typography( FontName headerFont, diff --git a/src/main/java/com/demcha/compose/document/templates/widgets/CardWidget.java b/src/main/java/com/demcha/compose/document/templates/widgets/CardWidget.java index 24e17b74f..c7ec16574 100644 --- a/src/main/java/com/demcha/compose/document/templates/widgets/CardWidget.java +++ b/src/main/java/com/demcha/compose/document/templates/widgets/CardWidget.java @@ -108,7 +108,7 @@ public record Style(double spacing, */ public Style { if (Double.isNaN(spacing) || Double.isInfinite(spacing) - || spacing < 0) { + || spacing < 0) { throw new IllegalArgumentException( "spacing must be finite and non-negative"); } diff --git a/src/main/java/com/demcha/compose/document/templates/widgets/TableWidget.java b/src/main/java/com/demcha/compose/document/templates/widgets/TableWidget.java index 456e7c2e6..3869e5b2a 100644 --- a/src/main/java/com/demcha/compose/document/templates/widgets/TableWidget.java +++ b/src/main/java/com/demcha/compose/document/templates/widgets/TableWidget.java @@ -142,7 +142,7 @@ private static List> normalizeRows(List> rows, if (row.size() > columns) { throw new IllegalArgumentException( "Row has " + row.size() + " cells, but table has " - + columns + " columns"); + + columns + " columns"); } List normalized = new ArrayList<>(columns); for (int i = 0; i < columns; i++) { @@ -195,15 +195,15 @@ public record Style(String name, ? DocumentInsets.zero() : cellPadding; if (lineSpacing != null - && (lineSpacing < 0 + && (lineSpacing < 0 || Double.isNaN(lineSpacing) || Double.isInfinite(lineSpacing))) { throw new IllegalArgumentException( "lineSpacing must be finite and non-negative"); } if (widthAdjustment < 0 - || Double.isNaN(widthAdjustment) - || Double.isInfinite(widthAdjustment)) { + || Double.isNaN(widthAdjustment) + || Double.isInfinite(widthAdjustment)) { throw new IllegalArgumentException( "widthAdjustment must be finite and non-negative"); } diff --git a/src/main/java/com/demcha/compose/document/templates/widgets/TimelineAxisWidget.java b/src/main/java/com/demcha/compose/document/templates/widgets/TimelineAxisWidget.java index a57948104..3225c3dba 100644 --- a/src/main/java/com/demcha/compose/document/templates/widgets/TimelineAxisWidget.java +++ b/src/main/java/com/demcha/compose/document/templates/widgets/TimelineAxisWidget.java @@ -45,13 +45,21 @@ */ public final class TimelineAxisWidget { - /** Marker shape drawn between line segments. */ + /** + * Marker shape drawn between line segments. + */ public enum Marker { - /** A circle with the configured stroke + fill. */ + /** + * A circle with the configured stroke + fill. + */ CIRCLE, - /** A square with the configured stroke + fill. */ + /** + * A square with the configured stroke + fill. + */ SQUARE, - /** No marker — line segments join directly. */ + /** + * No marker — line segments join directly. + */ NONE } @@ -120,8 +128,8 @@ private static void renderMarker(SectionBuilder host, Style style) { DocumentStroke stroke = style.markerStroke() != null ? style.markerStroke() : (style.lineColor() != null - ? DocumentStroke.of(style.lineColor(), 0.8) - : null); + ? DocumentStroke.of(style.lineColor(), 0.8) + : null); DocumentColor fill = style.markerFillColor() != null ? style.markerFillColor() : DocumentColor.WHITE; @@ -150,19 +158,19 @@ private static void renderMarker(SectionBuilder host, Style style) { /** * Visual configuration for {@link TimelineAxisWidget}. * - * @param marker shape drawn between segments - * @param markerSize diameter (CIRCLE) or side length (SQUARE) - * @param markerFillColor fill colour of the marker; {@code null} - * falls back to {@link DocumentColor#WHITE} - * @param markerStroke stroke around the marker; {@code null} - * falls back to {@code lineColor} at 0.8pt - * @param segmentLength length of each vertical line segment - * @param segmentCount number of segments (at least 1); - * markers between = {@code segmentCount - 1} - * @param lineColor colour of every line segment - * @param lineThickness thickness of every line segment - * @param padding inset applied to the host section - * before any drawing + * @param marker shape drawn between segments + * @param markerSize diameter (CIRCLE) or side length (SQUARE) + * @param markerFillColor fill colour of the marker; {@code null} + * falls back to {@link DocumentColor#WHITE} + * @param markerStroke stroke around the marker; {@code null} + * falls back to {@code lineColor} at 0.8pt + * @param segmentLength length of each vertical line segment + * @param segmentCount number of segments (at least 1); + * markers between = {@code segmentCount - 1} + * @param lineColor colour of every line segment + * @param lineThickness thickness of every line segment + * @param padding inset applied to the host section + * before any drawing */ public record Style(Marker marker, double markerSize, diff --git a/src/main/java/com/demcha/compose/document/theme/BusinessTheme.java b/src/main/java/com/demcha/compose/document/theme/BusinessTheme.java index 4527a9afd..8dfade051 100644 --- a/src/main/java/com/demcha/compose/document/theme/BusinessTheme.java +++ b/src/main/java/com/demcha/compose/document/theme/BusinessTheme.java @@ -1,14 +1,10 @@ package com.demcha.compose.document.theme; -import com.demcha.compose.document.style.DocumentColor; -import com.demcha.compose.document.style.DocumentInsets; -import com.demcha.compose.document.style.DocumentStroke; -import com.demcha.compose.document.style.DocumentTextDecoration; -import com.demcha.compose.document.style.DocumentTextStyle; +import com.demcha.compose.document.style.*; import com.demcha.compose.document.table.DocumentTableStyle; import com.demcha.compose.font.FontName; -import java.awt.Color; +import java.awt.*; import java.util.Objects; /** @@ -28,13 +24,12 @@ * (dark moody surface), and {@link #monochrome()} (brutalist * black-and-white with one accent).

* - * @param name human-readable theme identifier (used for diagnostics) - * @param palette color tokens - * @param spacing spacing scale - * @param text text-style scale - * @param table table preset + * @param name human-readable theme identifier (used for diagnostics) + * @param palette color tokens + * @param spacing spacing scale + * @param text text-style scale + * @param table table preset * @param pageBackground optional page-wide background tint, or {@code null} - * * @author Artem Demchyshyn */ public record BusinessTheme( diff --git a/src/main/java/com/demcha/compose/document/theme/DocumentPalette.java b/src/main/java/com/demcha/compose/document/theme/DocumentPalette.java index cced624de..3e921ed08 100644 --- a/src/main/java/com/demcha/compose/document/theme/DocumentPalette.java +++ b/src/main/java/com/demcha/compose/document/theme/DocumentPalette.java @@ -2,7 +2,7 @@ import com.demcha.compose.document.style.DocumentColor; -import java.awt.Color; +import java.awt.*; import java.util.Objects; /** @@ -11,14 +11,13 @@ *

Tokens are referenced by role rather than by value so a single template can * be re-skinned by swapping {@link BusinessTheme}s.

* - * @param primary headline color (titles, primary buttons, brand accents) - * @param accent secondary accent (status keywords, hyperlinks, highlights) - * @param surface dominant background tone (page, default panel) + * @param primary headline color (titles, primary buttons, brand accents) + * @param accent secondary accent (status keywords, hyperlinks, highlights) + * @param surface dominant background tone (page, default panel) * @param surfaceMuted subdued background (soft panels, table zebra) - * @param textPrimary primary body text color - * @param textMuted secondary/caption text color - * @param rule rule/divider/border color used by tables and accent strips - * + * @param textPrimary primary body text color + * @param textMuted secondary/caption text color + * @param rule rule/divider/border color used by tables and accent strips * @author Artem Demchyshyn */ public record DocumentPalette( @@ -62,17 +61,17 @@ public static Builder builder() { /** * Convenience factory accepting AWT colors. * - * @param primary primary color - * @param accent accent color - * @param surface surface color + * @param primary primary color + * @param accent accent color + * @param surface surface color * @param surfaceMuted muted surface color - * @param textPrimary primary text color - * @param textMuted muted text color - * @param rule rule/border color + * @param textPrimary primary text color + * @param textMuted muted text color + * @param rule rule/border color * @return palette built from raw AWT colors * @deprecated since 1.6.0; prefer {@link #builder()} so adding or - * reorganising palette tokens does not silently shift other - * values via argument-order. Scheduled for removal in v2.0. + * reorganising palette tokens does not silently shift other + * values via argument-order. Scheduled for removal in v2.0. */ @Deprecated(since = "1.6.0", forRemoval = true) public static DocumentPalette of(Color primary, @@ -268,8 +267,8 @@ public Builder rule(Color color) { * * @return immutable palette * @throws IllegalStateException if any required token was never set; - * the message names every missing token so the caller can - * add them in one fix-up. + * the message names every missing token so the caller can + * add them in one fix-up. */ public DocumentPalette build() { StringBuilder missing = null; @@ -283,7 +282,7 @@ public DocumentPalette build() { if (missing != null) { throw new IllegalStateException( "DocumentPalette.builder().build() requires every token to be set; missing: " - + missing); + + missing); } return new DocumentPalette(primary, accent, surface, surfaceMuted, textPrimary, textMuted, rule); } diff --git a/src/main/java/com/demcha/compose/document/theme/SpacingScale.java b/src/main/java/com/demcha/compose/document/theme/SpacingScale.java index 1273c6633..da5796658 100644 --- a/src/main/java/com/demcha/compose/document/theme/SpacingScale.java +++ b/src/main/java/com/demcha/compose/document/theme/SpacingScale.java @@ -13,7 +13,6 @@ * @param md medium gap (typical: 12) * @param lg large gap (typical: 20) * @param xl extra-large gap (typical: 32) - * * @author Artem Demchyshyn */ public record SpacingScale(double xs, double sm, double md, double lg, double xl) { @@ -30,7 +29,7 @@ public record SpacingScale(double xs, double sm, double md, double lg, double xl if (!(xs <= sm && sm <= md && md <= lg && lg <= xl)) { throw new IllegalArgumentException( "Spacing scale must be non-decreasing: xs=" + xs + " sm=" + sm - + " md=" + md + " lg=" + lg + " xl=" + xl); + + " md=" + md + " lg=" + lg + " xl=" + xl); } } @@ -91,7 +90,7 @@ public DocumentInsets insetsXl() { private static void validate(String label, double value) { if (value < 0 || Double.isNaN(value) || Double.isInfinite(value)) { throw new IllegalArgumentException("Spacing token '" + label - + "' must be a finite, non-negative number: " + value); + + "' must be a finite, non-negative number: " + value); } } } diff --git a/src/main/java/com/demcha/compose/document/theme/TablePreset.java b/src/main/java/com/demcha/compose/document/theme/TablePreset.java index 021f6db18..285a37622 100644 --- a/src/main/java/com/demcha/compose/document/theme/TablePreset.java +++ b/src/main/java/com/demcha/compose/document/theme/TablePreset.java @@ -14,10 +14,9 @@ * {@link #zebraStyle()} for alternating-row tinting.

* * @param defaultCellStyle base cell style (padding, body text style, borders) - * @param headerStyle override for header rows - * @param totalRowStyle override for total/summary rows - * @param zebraStyle override applied to every other body row for zebra tinting - * + * @param headerStyle override for header rows + * @param totalRowStyle override for total/summary rows + * @param zebraStyle override applied to every other body row for zebra tinting * @author Artem Demchyshyn */ public record TablePreset( diff --git a/src/main/java/com/demcha/compose/document/theme/TextScale.java b/src/main/java/com/demcha/compose/document/theme/TextScale.java index 98a35303b..bda53e810 100644 --- a/src/main/java/com/demcha/compose/document/theme/TextScale.java +++ b/src/main/java/com/demcha/compose/document/theme/TextScale.java @@ -12,14 +12,13 @@ * scale is intentionally compact — picking from a fixed set keeps invoice, * proposal, and report templates visually consistent.

* - * @param h1 document/title heading style - * @param h2 section heading style - * @param h3 sub-heading style - * @param body default paragraph style + * @param h1 document/title heading style + * @param h2 section heading style + * @param h3 sub-heading style + * @param body default paragraph style * @param caption small/secondary text style - * @param label form-label or table-header style - * @param accent inline accent style (for status keywords, totals) - * + * @param label form-label or table-header style + * @param accent inline accent style (for status keywords, totals) * @author Artem Demchyshyn */ public record TextScale(