From 7395bdac54401d8fa2e8bcd34768e6f2b3a664e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 19:42:39 +0200 Subject: [PATCH 01/11] checkstyle - using mailto --- .../java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java index dcdc04200..3706bd1f6 100644 --- a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java +++ b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java @@ -98,9 +98,9 @@ *

Notes

* This class was derived from a sample PDF creation listener * at "http://markmail.org/message/46t3bw7q6mbhvra2" - * by Jesse Keller . + * by * Jesse Keller * - * @author Tim Telcik + * @author Tim Telcik * @see DefaultPDFCreationListener * @see PDFCreationListener * @see ITextRenderer From 0c40d6d7dfdffabdc6ab6d0caa88fa39e2bad358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 19:50:19 +0200 Subject: [PATCH 02/11] checkstyle - renaming variables according to checktyle --- .../openpdf/css/style/BorderRadiusCorner.java | 6 ++--- .../org/openpdf/pdf/ITextOutputDevice.java | 24 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java b/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java index 1d9d9c4fe..62c9afe1a 100644 --- a/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java +++ b/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java @@ -29,9 +29,9 @@ public BorderRadiusCorner(float left, float right) { public BorderRadiusCorner(CSSName fromVal, CalculatedStyle style, CssContext ctx) { FSDerivedValue value = style.valueByName(fromVal); - if (value instanceof ListValue lValues) { - PropertyValue first = (PropertyValue) lValues.getValues().get(0); - PropertyValue second = lValues.getValues().size() > 1 ? (PropertyValue) lValues.getValues().get(1) : first; + if (value instanceof ListValue lv) { + PropertyValue first = (PropertyValue) lv.getValues().get(0); + PropertyValue second = lv.getValues().size() > 1 ? (PropertyValue) lv.getValues().get(1) : first; if (fromVal.equals(BORDER_TOP_LEFT_RADIUS) || fromVal.equals(BORDER_BOTTOM_RIGHT_RADIUS)) { _right = calculate(fromVal, style, first, ctx); diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java index 1611ec6dd..c76f9c199 100644 --- a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java +++ b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java @@ -739,7 +739,7 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { if (newStroke == oldStroke) { return; } - if (!(newStroke instanceof BasicStroke nStroke)) { + if (!(newStroke instanceof BasicStroke bs)) { return; } boolean oldOk = (oldStroke instanceof BasicStroke); @@ -747,11 +747,11 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { if (oldOk) { oStroke = (BasicStroke) oldStroke; } - if (!oldOk || nStroke.getLineWidth() != oStroke.getLineWidth()) { - cb.setLineWidth(nStroke.getLineWidth()); + if (!oldOk || bs.getLineWidth() != oStroke.getLineWidth()) { + cb.setLineWidth(bs.getLineWidth()); } - if (!oldOk || nStroke.getEndCap() != oStroke.getEndCap()) { - switch (nStroke.getEndCap()) { + if (!oldOk || bs.getEndCap() != oStroke.getEndCap()) { + switch (bs.getEndCap()) { case BasicStroke.CAP_BUTT: cb.setLineCap(0); break; @@ -762,8 +762,8 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLineCap(1); } } - if (!oldOk || nStroke.getLineJoin() != oStroke.getLineJoin()) { - switch (nStroke.getLineJoin()) { + if (!oldOk || bs.getLineJoin() != oStroke.getLineJoin()) { + switch (bs.getLineJoin()) { case BasicStroke.JOIN_MITER: cb.setLineJoin(0); break; @@ -774,12 +774,12 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLineJoin(1); } } - if (!oldOk || nStroke.getMiterLimit() != oStroke.getMiterLimit()) { - cb.setMiterLimit(nStroke.getMiterLimit()); + if (!oldOk || bs.getMiterLimit() != oStroke.getMiterLimit()) { + cb.setMiterLimit(bs.getMiterLimit()); } - boolean makeDash = isMakeDash(oldOk, nStroke, oStroke); + boolean makeDash = isMakeDash(oldOk, bs, oStroke); if (makeDash) { - float[] dash = nStroke.getDashArray(); + float[] dash = bs.getDashArray(); if (dash == null) { cb.setLiteral("[]0 d\n"); } else { @@ -789,7 +789,7 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLiteral(' '); } cb.setLiteral(']'); - cb.setLiteral(nStroke.getDashPhase()); + cb.setLiteral(bs.getDashPhase()); cb.setLiteral(" d\n"); } } From f549376b6c28e202ee6406357c2c8631869125de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 19:58:23 +0200 Subject: [PATCH 03/11] checkstyle - temp commenting rules (IllegalTokenText, OneTopLevelClass) --- checkstyle.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/checkstyle.xml b/checkstyle.xml index 7b0e7d5d4..bd80337fd 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -58,6 +58,9 @@ + + + + + + From 60488a8dc249574d102e36a5d1b23299be8eca24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 20:05:29 +0200 Subject: [PATCH 04/11] checkstyle - adding fallthru to supress check --- openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java | 3 ++- .../src/main/java/org/openpdf/renderer/font/Type1CFont.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java index 89a506336..14017d315 100644 --- a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java +++ b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java @@ -1996,7 +1996,8 @@ public Token yylex() throws java.io.IOException { case 45: { /* ignore comments */ } - case 84: break; + //fallthru + case 84: break; case 9: { return Token.TK_PERIOD; } diff --git a/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java b/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java index 500d9278f..eb2eb8290 100644 --- a/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java +++ b/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java @@ -938,6 +938,7 @@ void parseGlyph(Range r, GeneralPath gp, FlPoint pt) { break; case 30: // vhcurveto hold = 4; + //fallthru case 31: // hvcurveto for (i = 0; i < this.stackptr;) { boolean hv = (((i + hold) & 4) == 0); From 2872a12209112555940e946ae4c8bb2affde144f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 19:42:39 +0200 Subject: [PATCH 05/11] checkstyle - using mailto --- .../java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java index dcdc04200..3706bd1f6 100644 --- a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java +++ b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java @@ -98,9 +98,9 @@ *

Notes

* This class was derived from a sample PDF creation listener * at "http://markmail.org/message/46t3bw7q6mbhvra2" - * by Jesse Keller . + * by * Jesse Keller * - * @author Tim Telcik + * @author Tim Telcik * @see DefaultPDFCreationListener * @see PDFCreationListener * @see ITextRenderer From a809f6bcf49881c7a745a9e3a47ea09b56878351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 19:50:19 +0200 Subject: [PATCH 06/11] checkstyle - renaming variables according to checktyle --- .../openpdf/css/style/BorderRadiusCorner.java | 6 ++--- .../org/openpdf/pdf/ITextOutputDevice.java | 24 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java b/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java index 1d9d9c4fe..62c9afe1a 100644 --- a/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java +++ b/openpdf-html/src/main/java/org/openpdf/css/style/BorderRadiusCorner.java @@ -29,9 +29,9 @@ public BorderRadiusCorner(float left, float right) { public BorderRadiusCorner(CSSName fromVal, CalculatedStyle style, CssContext ctx) { FSDerivedValue value = style.valueByName(fromVal); - if (value instanceof ListValue lValues) { - PropertyValue first = (PropertyValue) lValues.getValues().get(0); - PropertyValue second = lValues.getValues().size() > 1 ? (PropertyValue) lValues.getValues().get(1) : first; + if (value instanceof ListValue lv) { + PropertyValue first = (PropertyValue) lv.getValues().get(0); + PropertyValue second = lv.getValues().size() > 1 ? (PropertyValue) lv.getValues().get(1) : first; if (fromVal.equals(BORDER_TOP_LEFT_RADIUS) || fromVal.equals(BORDER_BOTTOM_RIGHT_RADIUS)) { _right = calculate(fromVal, style, first, ctx); diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java index 1611ec6dd..c76f9c199 100644 --- a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java +++ b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java @@ -739,7 +739,7 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { if (newStroke == oldStroke) { return; } - if (!(newStroke instanceof BasicStroke nStroke)) { + if (!(newStroke instanceof BasicStroke bs)) { return; } boolean oldOk = (oldStroke instanceof BasicStroke); @@ -747,11 +747,11 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { if (oldOk) { oStroke = (BasicStroke) oldStroke; } - if (!oldOk || nStroke.getLineWidth() != oStroke.getLineWidth()) { - cb.setLineWidth(nStroke.getLineWidth()); + if (!oldOk || bs.getLineWidth() != oStroke.getLineWidth()) { + cb.setLineWidth(bs.getLineWidth()); } - if (!oldOk || nStroke.getEndCap() != oStroke.getEndCap()) { - switch (nStroke.getEndCap()) { + if (!oldOk || bs.getEndCap() != oStroke.getEndCap()) { + switch (bs.getEndCap()) { case BasicStroke.CAP_BUTT: cb.setLineCap(0); break; @@ -762,8 +762,8 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLineCap(1); } } - if (!oldOk || nStroke.getLineJoin() != oStroke.getLineJoin()) { - switch (nStroke.getLineJoin()) { + if (!oldOk || bs.getLineJoin() != oStroke.getLineJoin()) { + switch (bs.getLineJoin()) { case BasicStroke.JOIN_MITER: cb.setLineJoin(0); break; @@ -774,12 +774,12 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLineJoin(1); } } - if (!oldOk || nStroke.getMiterLimit() != oStroke.getMiterLimit()) { - cb.setMiterLimit(nStroke.getMiterLimit()); + if (!oldOk || bs.getMiterLimit() != oStroke.getMiterLimit()) { + cb.setMiterLimit(bs.getMiterLimit()); } - boolean makeDash = isMakeDash(oldOk, nStroke, oStroke); + boolean makeDash = isMakeDash(oldOk, bs, oStroke); if (makeDash) { - float[] dash = nStroke.getDashArray(); + float[] dash = bs.getDashArray(); if (dash == null) { cb.setLiteral("[]0 d\n"); } else { @@ -789,7 +789,7 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLiteral(' '); } cb.setLiteral(']'); - cb.setLiteral(nStroke.getDashPhase()); + cb.setLiteral(bs.getDashPhase()); cb.setLiteral(" d\n"); } } From e9443f76c7820a9e4dd740c90a8223b1b6418ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 19:58:23 +0200 Subject: [PATCH 07/11] checkstyle - temp commenting rules (IllegalTokenText, OneTopLevelClass) --- checkstyle.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/checkstyle.xml b/checkstyle.xml index 7b0e7d5d4..bd80337fd 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -58,6 +58,9 @@ + + + + + + From 2740f7b87f0cbf06f6a1f9298ff1caee0ffd51b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Wed, 20 May 2026 20:05:29 +0200 Subject: [PATCH 08/11] checkstyle - adding fallthru to supress check --- openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java | 3 ++- .../src/main/java/org/openpdf/renderer/font/Type1CFont.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java index 89a506336..14017d315 100644 --- a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java +++ b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java @@ -1996,7 +1996,8 @@ public Token yylex() throws java.io.IOException { case 45: { /* ignore comments */ } - case 84: break; + //fallthru + case 84: break; case 9: { return Token.TK_PERIOD; } diff --git a/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java b/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java index 500d9278f..eb2eb8290 100644 --- a/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java +++ b/openpdf-renderer/src/main/java/org/openpdf/renderer/font/Type1CFont.java @@ -938,6 +938,7 @@ void parseGlyph(Range r, GeneralPath gp, FlPoint pt) { break; case 30: // vhcurveto hold = 4; + //fallthru case 31: // hvcurveto for (i = 0; i < this.stackptr;) { boolean hv = (((i + hold) & 4) == 0); From aceb7af266e069da92264ce4223f7d5730a1f0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Fri, 22 May 2026 20:21:08 +0200 Subject: [PATCH 09/11] PR comment refactoring --- .../src/main/java/org/openpdf/css/parser/Lexer.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java index 14017d315..49ded97fb 100644 --- a/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java +++ b/openpdf-html/src/main/java/org/openpdf/css/parser/Lexer.java @@ -1993,11 +1993,8 @@ public Token yylex() throws java.io.IOException { return Token.TK_VERTICAL_BAR; } case 83: break; - case 45: { - /* ignore comments */ - } - //fallthru - case 84: break; + case 45: //fallthru + case 84: break; case 9: { return Token.TK_PERIOD; } From 369c6cd32298fb160429b09647c52f82866c1652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Fri, 22 May 2026 20:24:53 +0200 Subject: [PATCH 10/11] mailto - style --- .../java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java index 3706bd1f6..51626e066 100644 --- a/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java +++ b/openpdf-html/src/main/java/org/openpdf/pdf/util/XHtmlMetaToPdfInfoAdapter.java @@ -98,7 +98,7 @@ *

Notes

* This class was derived from a sample PDF creation listener * at "http://markmail.org/message/46t3bw7q6mbhvra2" - * by * Jesse Keller + * by Jesse Keller * * @author Tim Telcik * @see DefaultPDFCreationListener From db530286c46b7ed5853441d9c0f792f89dad44ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Tomaszek?= Date: Fri, 22 May 2026 21:17:40 +0200 Subject: [PATCH 11/11] renaming variables for better method understanding (PR comment) --- .../org/openpdf/pdf/ITextOutputDevice.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java index c76f9c199..f6237f441 100644 --- a/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java +++ b/openpdf-html/src/main/java/org/openpdf/pdf/ITextOutputDevice.java @@ -739,19 +739,19 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { if (newStroke == oldStroke) { return; } - if (!(newStroke instanceof BasicStroke bs)) { + if (!(newStroke instanceof BasicStroke newBasicStroke)) { return; } boolean oldOk = (oldStroke instanceof BasicStroke); - BasicStroke oStroke = null; + BasicStroke oldBasicStroke = null; if (oldOk) { - oStroke = (BasicStroke) oldStroke; + oldBasicStroke = (BasicStroke) oldStroke; } - if (!oldOk || bs.getLineWidth() != oStroke.getLineWidth()) { - cb.setLineWidth(bs.getLineWidth()); + if (!oldOk || newBasicStroke.getLineWidth() != oldBasicStroke.getLineWidth()) { + cb.setLineWidth(newBasicStroke.getLineWidth()); } - if (!oldOk || bs.getEndCap() != oStroke.getEndCap()) { - switch (bs.getEndCap()) { + if (!oldOk || newBasicStroke.getEndCap() != oldBasicStroke.getEndCap()) { + switch (newBasicStroke.getEndCap()) { case BasicStroke.CAP_BUTT: cb.setLineCap(0); break; @@ -762,8 +762,8 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLineCap(1); } } - if (!oldOk || bs.getLineJoin() != oStroke.getLineJoin()) { - switch (bs.getLineJoin()) { + if (!oldOk || newBasicStroke.getLineJoin() != oldBasicStroke.getLineJoin()) { + switch (newBasicStroke.getLineJoin()) { case BasicStroke.JOIN_MITER: cb.setLineJoin(0); break; @@ -774,12 +774,12 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLineJoin(1); } } - if (!oldOk || bs.getMiterLimit() != oStroke.getMiterLimit()) { - cb.setMiterLimit(bs.getMiterLimit()); + if (!oldOk || newBasicStroke.getMiterLimit() != oldBasicStroke.getMiterLimit()) { + cb.setMiterLimit(newBasicStroke.getMiterLimit()); } - boolean makeDash = isMakeDash(oldOk, bs, oStroke); + boolean makeDash = isMakeDash(oldOk, newBasicStroke, oldBasicStroke); if (makeDash) { - float[] dash = bs.getDashArray(); + float[] dash = newBasicStroke.getDashArray(); if (dash == null) { cb.setLiteral("[]0 d\n"); } else { @@ -789,7 +789,7 @@ private void setStrokeDiff(Stroke newStroke, @Nullable Stroke oldStroke) { cb.setLiteral(' '); } cb.setLiteral(']'); - cb.setLiteral(bs.getDashPhase()); + cb.setLiteral(newBasicStroke.getDashPhase()); cb.setLiteral(" d\n"); } }