From 763e60b2d15eb18de43b97312fae6fb0a9a4bee5 Mon Sep 17 00:00:00 2001 From: soloturn Date: Sat, 24 Sep 2022 10:56:32 +0200 Subject: [PATCH 1/3] literal & in javaddoc --- .../plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java b/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java index 2ad01fea1..e8c7e444e 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java +++ b/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java @@ -18,7 +18,7 @@ package ext.plantuml.com.google.zxing.qrcode.encoder; /** * A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a - * unsigned container, it's up to you to do byteValue & 0xff at each location. + * unsigned container, it's up to you to do byteValue {@literal &} 0xff at each location. * * JAVAPORT: The original code was a 2D array of ints, but since it only ever gets assigned * -1, 0, and 1, I'm going to use less memory and go with bytes. From c124a9d550fbd90578aca3ce8b3e4f46d11173d4 Mon Sep 17 00:00:00 2001 From: soloturn Date: Sat, 24 Sep 2022 10:58:52 +0200 Subject: [PATCH 2/3] javadoc links which are not in the code removed --- .../com/google/zxing/DecodeHintType.java | 6 ++---- src/jcckit/GraphicsPlotCanvas.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/ext/plantuml/com/google/zxing/DecodeHintType.java b/src/ext/plantuml/com/google/zxing/DecodeHintType.java index 133abb988..39d20f30c 100644 --- a/src/ext/plantuml/com/google/zxing/DecodeHintType.java +++ b/src/ext/plantuml/com/google/zxing/DecodeHintType.java @@ -16,8 +16,6 @@ package ext.plantuml.com.google.zxing; -import java.io.Reader; - /** * Encapsulates a type of hint that a caller may pass to a barcode reader to help it * more quickly or accurately decode it. It is up to implementations to decide what, @@ -25,7 +23,7 @@ import java.io.Reader; * * @author Sean Owen * @author dswitkin@google.com (Daniel Switkin) - * @see Reader#decode(BinaryBitmap,java.util.Hashtable) + * see Reader#decode(BinaryBitmap,java.util.Hashtable) */ public final class DecodeHintType { @@ -71,7 +69,7 @@ public final class DecodeHintType { /** * The caller needs to be notified via callback when a possible {@link ResultPoint} - * is found. Maps to a {@link ResultPointCallback}. + * is found. Maps to a ResultPointCallback. */ public static final DecodeHintType NEED_RESULT_POINT_CALLBACK = new DecodeHintType(); diff --git a/src/jcckit/GraphicsPlotCanvas.java b/src/jcckit/GraphicsPlotCanvas.java index 21527d677..f2e346573 100644 --- a/src/jcckit/GraphicsPlotCanvas.java +++ b/src/jcckit/GraphicsPlotCanvas.java @@ -35,16 +35,16 @@ import jcckit.util.Factory; /** * Class which handles plotting into a Graphics context based on the - * {@link jcckit.renderer.GraphicsRenderer}. This class is not a subclass of + * {link jcckit.renderer.GraphicsRenderer}. This class is not a subclass of * java.awt.Component. The actual AWT component presenting the plot * is an innerclass. Its instance wrapped by GraphicsPlotCanvas can - * be obtained with {@link #getGraphicsCanvas}. + * be obtained with {link #getGraphicsCanvas}. *

* The plot is painted by using double-buffering and pre-rendered view of the * coordinate system. That is, the coordinate system is drawn into an off-screen * image. It will be redrawn only if the size of the embedding AWT component is * changed. - * + * * @author Franz-Josef Elmer */ public class GraphicsPlotCanvas extends PlotCanvas { @@ -57,7 +57,7 @@ public class GraphicsPlotCanvas extends PlotCanvas { * Class which does the actual painting. Needs the Component into * which the plot is painted for some resources like size, background color, * etc. - * + * * @author Franz-Josef Elmer */ private final BufferedImage img3; @@ -95,7 +95,7 @@ public class GraphicsPlotCanvas extends PlotCanvas { * * doubleBuffering = true * booleanno - * If true the plot will be painted by using + * If true the plot will be painted by using * double-buffering and pre-rendered view of the coordinate system. * * @@ -120,7 +120,7 @@ public class GraphicsPlotCanvas extends PlotCanvas { private final Color foreground; /** - * Paints the plot. If {@link GraphicsPlotCanvas#_doubleBuffering} is set + * Paints the plot. If {link GraphicsPlotCanvas#_doubleBuffering} is set * double-buffering and pre-rendered view of the coordinate system is used. */ public void paint() { @@ -192,8 +192,8 @@ public class GraphicsPlotCanvas extends PlotCanvas { /** * Sets the renderer used to render the plot. The default value is - * {@link GraphicsRenderer}. - * + * {link GraphicsRenderer}. + * * @param className * Fully qualified name of the renderer class. */ @@ -217,7 +217,7 @@ public class GraphicsPlotCanvas extends PlotCanvas { /** * Defines a graphical marker which will be drawn on top of the plot. To * remove the marker call this method with argument null. - * + * * @param marker * Marker element. Can be null. */ From 64fe77dc58187675dd3036dac31468cbf4ab8e57 Mon Sep 17 00:00:00 2001 From: soloturn Date: Sat, 24 Sep 2022 11:09:53 +0200 Subject: [PATCH 3/3] update jupiter to 5.9.1, batik to 1.15 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 292c617d0..7aa90ec6a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,10 +26,10 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.12") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.junit.jupiter:junit-jupiter:5.9.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.9.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") "pdfRuntimeOnly"("org.apache.xmlgraphics:fop:2.7") - "pdfRuntimeOnly"("org.apache.xmlgraphics:batik-all:1.14") + "pdfRuntimeOnly"("org.apache.xmlgraphics:batik-all:1.15") } repositories {