diff --git a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle index d62ee0701..ee7652188 100644 --- a/buildSrc/src/main/groovy/echosvg.java-conventions.gradle +++ b/buildSrc/src/main/groovy/echosvg.java-conventions.gradle @@ -2,6 +2,7 @@ plugins { id 'java-library' id 'maven-publish' id 'org.owasp.dependencycheck' + id 'checkstyle' id 'com.github.jk1.dependency-license-report' } @@ -138,6 +139,10 @@ licenseReport { allowedLicensesFile = new File("$rootDir/buildSrc/allowed-licenses.json") } +checkstyle { + toolVersion = "${checkstyleVersion}" +} + publishing { publications { maven(MavenPublication) { diff --git a/checkstyle.xml b/checkstyle.xml deleted file mode 100644 index 986b47306..000000000 --- a/checkstyle.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/checkstylesuppressions.xml b/checkstylesuppressions.xml deleted file mode 100644 index a7cdb7cd3..000000000 --- a/checkstylesuppressions.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 000000000..a287e28fb --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml new file mode 100644 index 000000000..8a21f9e9a --- /dev/null +++ b/config/checkstyle/suppressions.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEConvolveMatrixElement.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEConvolveMatrixElement.java index 6212bbd84..b50210009 100644 --- a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEConvolveMatrixElement.java +++ b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEConvolveMatrixElement.java @@ -213,7 +213,8 @@ public SVGAnimatedNumber getBias() { */ @Override public SVGAnimatedNumber getKernelUnitLengthX() { - throw new UnsupportedOperationException("SVGFEConvolveMatrixElement.getKernelUnitLengthX is not implemented"); // XXX + throw new UnsupportedOperationException( + "SVGFEConvolveMatrixElement.getKernelUnitLengthX is not implemented"); // XXX } /** @@ -222,7 +223,8 @@ public SVGAnimatedNumber getKernelUnitLengthX() { */ @Override public SVGAnimatedNumber getKernelUnitLengthY() { - throw new UnsupportedOperationException("SVGFEConvolveMatrixElement.getKernelUnitLengthY is not implemented"); // XXX + throw new UnsupportedOperationException( + "SVGFEConvolveMatrixElement.getKernelUnitLengthY is not implemented"); // XXX } /** diff --git a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEDiffuseLightingElement.java b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEDiffuseLightingElement.java index e6be8ef22..58152575b 100644 --- a/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEDiffuseLightingElement.java +++ b/echosvg-anim/src/main/java/io/sf/carte/echosvg/anim/dom/SVGOMFEDiffuseLightingElement.java @@ -142,7 +142,8 @@ public SVGAnimatedNumber getDiffuseConstant() { */ @Override public SVGAnimatedNumber getKernelUnitLengthX() { - throw new UnsupportedOperationException("SVGFEDiffuseLightingElement.getKernelUnitLengthX is not implemented"); // XXX + throw new UnsupportedOperationException( + "SVGFEDiffuseLightingElement.getKernelUnitLengthX is not implemented"); // XXX } /** @@ -151,7 +152,8 @@ public SVGAnimatedNumber getKernelUnitLengthX() { */ @Override public SVGAnimatedNumber getKernelUnitLengthY() { - throw new UnsupportedOperationException("SVGFEDiffuseLightingElement.getKernelUnitLengthY is not implemented"); // XXX + throw new UnsupportedOperationException( + "SVGFEDiffuseLightingElement.getKernelUnitLengthY is not implemented"); // XXX } /** diff --git a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java index b9f083643..38b03f225 100644 --- a/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java +++ b/echosvg-bridge/src/main/java/io/sf/carte/echosvg/bridge/SVGAnimationEngine.java @@ -130,17 +130,20 @@ public class SVGAnimationEngine extends AnimationEngine { /** * The factory for unparsed string values. */ - protected UncomputedAnimatableStringValueFactory uncomputedAnimatableStringValueFactory = new UncomputedAnimatableStringValueFactory(); + protected UncomputedAnimatableStringValueFactory uncomputedAnimatableStringValueFactory = + new UncomputedAnimatableStringValueFactory(); /** * The factory for length-or-ident values. */ - protected AnimatableLengthOrIdentFactory animatableLengthOrIdentFactory = new AnimatableLengthOrIdentFactory(); + protected AnimatableLengthOrIdentFactory animatableLengthOrIdentFactory = + new AnimatableLengthOrIdentFactory(); /** * The factory for number-or-ident values. */ - protected AnimatableNumberOrIdentFactory animatableNumberOrIdentFactory = new AnimatableNumberOrIdentFactory(false); + protected AnimatableNumberOrIdentFactory animatableNumberOrIdentFactory = + new AnimatableNumberOrIdentFactory(false); /** * Factories for {@link AnimatableValue} parsing. diff --git a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractDocument.java b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractDocument.java index 76820c70d..3351c11b1 100644 --- a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractDocument.java +++ b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractDocument.java @@ -1158,7 +1158,8 @@ public Node renameNode(Node n, String ns, String qn) { fireUserDataHandlers(UserDataHandler.NODE_RENAMED, n, e); if (getEventsEnabled()) { MutationNameEvent ev = (MutationNameEvent) createEvent("MutationNameEvent"); - ev.initMutationNameEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMElementNameChanged", true, // canBubbleArg + ev.initMutationNameEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMElementNameChanged", + true, // canBubbleArg false, // cancelableArg null, // relatedNodeArg prevNamespaceURI, prevNodeName); @@ -1187,7 +1188,8 @@ public Node renameNode(Node n, String ns, String qn) { fireUserDataHandlers(UserDataHandler.NODE_RENAMED, a, null); if (getEventsEnabled()) { MutationNameEvent ev = (MutationNameEvent) createEvent("MutationNameEvent"); - ev.initMutationNameEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMAttrNameChanged", true, // canBubbleArg + ev.initMutationNameEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMAttrNameChanged", + true, // canBubbleArg false, // cancelableArg a, // relatedNodeArg prevNamespaceURI, prevNodeName); @@ -1220,7 +1222,8 @@ public Node renameNode(Node n, String ns, String qn) { fireUserDataHandlers(UserDataHandler.NODE_RENAMED, a, a2); if (getEventsEnabled()) { MutationNameEvent ev = (MutationNameEvent) createEvent("MutationNameEvent"); - ev.initMutationNameEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMAttrNameChanged", true, // canBubbleArg + ev.initMutationNameEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMAttrNameChanged", + true, // canBubbleArg false, // cancelableArg a2, // relatedNodeArg prevNamespaceURI, prevNodeName); diff --git a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractNode.java b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractNode.java index 8f4de0af2..316a48037 100644 --- a/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractNode.java +++ b/echosvg-dom/src/main/java/io/sf/carte/echosvg/dom/AbstractNode.java @@ -1036,7 +1036,8 @@ public void fireDOMNodeInsertedIntoDocumentEvent() { AbstractDocument doc = getCurrentDocument(); if (doc.getEventsEnabled()) { DOMMutationEvent ev = (DOMMutationEvent) doc.createEvent("MutationEvents"); - ev.initMutationEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMNodeInsertedIntoDocument", true, // canBubbleArg + ev.initMutationEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMNodeInsertedIntoDocument", + true, // canBubbleArg false, // cancelableArg null, // relatedNodeArg null, // prevValueArg @@ -1054,7 +1055,8 @@ public void fireDOMNodeRemovedFromDocumentEvent() { AbstractDocument doc = getCurrentDocument(); if (doc.getEventsEnabled()) { DOMMutationEvent ev = (DOMMutationEvent) doc.createEvent("MutationEvents"); - ev.initMutationEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMNodeRemovedFromDocument", true, // canBubbleArg + ev.initMutationEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMNodeRemovedFromDocument", + true, // canBubbleArg false, // cancelableArg null, // relatedNodeArg null, // prevValueArg @@ -1072,7 +1074,8 @@ protected void fireDOMCharacterDataModifiedEvent(String oldv, String newv) { AbstractDocument doc = getCurrentDocument(); if (doc.getEventsEnabled()) { DOMMutationEvent ev = (DOMMutationEvent) doc.createEvent("MutationEvents"); - ev.initMutationEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMCharacterDataModified", true, // canBubbleArg + ev.initMutationEventNS(XMLConstants.XML_EVENTS_NAMESPACE_URI, "DOMCharacterDataModified", + true, // canBubbleArg false, // cancelableArg null, // relatedNodeArg oldv, // prevValueArg diff --git a/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGAlphaComposite.java b/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGAlphaComposite.java index c200387dc..296d1c2ef 100644 --- a/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGAlphaComposite.java +++ b/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGAlphaComposite.java @@ -217,7 +217,8 @@ private Element compositeToSVG(AlphaComposite composite) { throw new RuntimeException("invalid rule:" + composite.getRule()); } - Element compositeFilter = getGeneratorContext().getDOMFactory().createElementNS(SVG_NAMESPACE_URI, SVG_FILTER_TAG); + Element compositeFilter = getGeneratorContext().getDOMFactory() + .createElementNS(SVG_NAMESPACE_URI, SVG_FILTER_TAG); compositeFilter.setAttributeNS(null, SVG_ID_ATTRIBUTE, id); compositeFilter.setAttributeNS(null, SVG_FILTER_UNITS_ATTRIBUTE, SVG_OBJECT_BOUNDING_BOX_VALUE); compositeFilter.setAttributeNS(null, SVG_X_ATTRIBUTE, SVG_ZERO_PERCENT_VALUE); @@ -225,7 +226,8 @@ private Element compositeToSVG(AlphaComposite composite) { compositeFilter.setAttributeNS(null, SVG_WIDTH_ATTRIBUTE, SVG_HUNDRED_PERCENT_VALUE); compositeFilter.setAttributeNS(null, SVG_HEIGHT_ATTRIBUTE, SVG_HUNDRED_PERCENT_VALUE); - Element feComposite = getGeneratorContext().getDOMFactory().createElementNS(SVG_NAMESPACE_URI, SVG_FE_COMPOSITE_TAG); + Element feComposite = getGeneratorContext().getDOMFactory() + .createElementNS(SVG_NAMESPACE_URI, SVG_FE_COMPOSITE_TAG); feComposite.setAttributeNS(null, SVG_OPERATOR_ATTRIBUTE, operator); feComposite.setAttributeNS(null, SVG_IN_ATTRIBUTE, input1); feComposite.setAttributeNS(null, SVG_IN2_ATTRIBUTE, input2); diff --git a/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGFont.java b/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGFont.java index 1523dc553..59b8b1204 100644 --- a/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGFont.java +++ b/echosvg-svggen/src/main/java/io/sf/carte/echosvg/svggen/SVGFont.java @@ -346,7 +346,8 @@ public SVGFontDescriptor toSVG(Font font, FontRenderContext frc) { AffineTransform at = AffineTransform.getScaleInstance(1, -1); glyphShape = at.createTransformedShape(glyphShape); - glyphElement.setAttributeNS(null, SVG_D_ATTRIBUTE, SVGPath.toSVGPathData(glyphShape, getGeneratorContext())); + glyphElement.setAttributeNS(null, SVG_D_ATTRIBUTE, + SVGPath.toSVGPathData(glyphShape, getGeneratorContext())); glyphElement.setAttributeNS(null, SVG_HORIZ_ADV_X_ATTRIBUTE, String.valueOf(gm.getAdvance())); glyphElement.setAttributeNS(null, SVG_UNICODE_ATTRIBUTE, String.valueOf(c)); diff --git a/echosvg-test/src/jmh/java/io/sf/carte/echosvg/svggen/jmh/DoubleStringPerformanceMark.java b/echosvg-test/src/jmh/java/io/sf/carte/echosvg/svggen/jmh/DoubleStringPerformanceMark.java index 932b585fb..22d597230 100644 --- a/echosvg-test/src/jmh/java/io/sf/carte/echosvg/svggen/jmh/DoubleStringPerformanceMark.java +++ b/echosvg-test/src/jmh/java/io/sf/carte/echosvg/svggen/jmh/DoubleStringPerformanceMark.java @@ -47,7 +47,7 @@ public class DoubleStringPerformanceMark { 2.3333444000044e56, 45.3456 }; @Benchmark - public void DoubleStringMark() { + public void markDoubleString() { DOMImplementation impl = SVGDOMImplementation.getDOMImplementation(); String svgNS = SVGDOMImplementation.SVG_NAMESPACE_URI; Document doc = impl.createDocument(svgNS, "svg", null); diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultExternalResourceSecurityTestCase.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultExternalResourceSecurityTest.java similarity index 96% rename from echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultExternalResourceSecurityTestCase.java rename to echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultExternalResourceSecurityTest.java index 0d3e3d502..66f526c64 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultExternalResourceSecurityTestCase.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultExternalResourceSecurityTest.java @@ -26,7 +26,7 @@ /* * Test adapted from commit bfbccb6ad2 by S. Steiner */ -public class DefaultExternalResourceSecurityTestCase { +public class DefaultExternalResourceSecurityTest { @Test public void testJarURL() { diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultScriptSecurityTestCase.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultScriptSecurityTest.java similarity index 98% rename from echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultScriptSecurityTestCase.java rename to echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultScriptSecurityTest.java index 9ab40af98..f3345a233 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultScriptSecurityTestCase.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/bridge/DefaultScriptSecurityTest.java @@ -29,7 +29,7 @@ /* * Test based on commits 3f937cfea7 and 905f368b5 by S. Steiner */ -public class DefaultScriptSecurityTestCase { +public class DefaultScriptSecurityTest { @Test public void testSameHost() { diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/JPainterCompare.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/JPainterCompare.java index 71c145219..7ec9fd747 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/JPainterCompare.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/JPainterCompare.java @@ -56,27 +56,27 @@ public class JPainterCompare extends JPanel implements SVGConstants { */ public static final Dimension CANVAS_SIZE = new Dimension(300, 400); - public static String MESSAGES_USAGE = "JPainterCompare.messages.usage"; + public static final String MESSAGES_USAGE = "JPainterCompare.messages.usage"; - public static String MESSAGES_LOADING_CLASS = "JPainterCompare.messages.loading.class"; + public static final String MESSAGES_LOADING_CLASS = "JPainterCompare.messages.loading.class"; - public static String MESSAGES_LOADED_CLASS = "JPainterCompare.messages.loaded.class"; + public static final String MESSAGES_LOADED_CLASS = "JPainterCompare.messages.loaded.class"; - public static String MESSAGES_INSTANCIATED_OBJECT = "JPainterCompare.messages.instanciated.object"; + public static final String MESSAGES_INSTANCIATED_OBJECT = "JPainterCompare.messages.instanciated.object"; - public static String ERROR_COULD_NOT_LOAD_CLASS = "JPainterCompare.error.could.not.load.class"; + public static final String ERROR_COULD_NOT_LOAD_CLASS = "JPainterCompare.error.could.not.load.class"; - public static String ERROR_COULD_NOT_INSTANCIATE_OBJECT = "JPainterCompare.error.could.not.instanciate.object"; + public static final String ERROR_COULD_NOT_INSTANCIATE_OBJECT = "JPainterCompare.error.could.not.instanciate.object"; - public static String ERROR_CLASS_NOT_PAINTER = "JPainterCompare.error.class.not.painter"; + public static final String ERROR_CLASS_NOT_PAINTER = "JPainterCompare.error.class.not.painter"; - public static String ERROR_COULD_NOT_TRANSCODE_TO_SVG = "JPainterCompare.error.could.not.transcode.to.svg"; + public static final String ERROR_COULD_NOT_TRANSCODE_TO_SVG = "JPainterCompare.error.could.not.transcode.to.svg"; - public static String ERROR_COULD_NOT_CONVERT_FILE_PATH_TO_URL = "JPainterCompare.error.could.not.convert.file.path.to.url"; + public static final String ERROR_COULD_NOT_CONVERT_FILE_PATH_TO_URL = "JPainterCompare.error.could.not.convert.file.path.to.url"; - public static String ERROR_COULD_NOT_RENDER_GENERATED_SVG = "JPainterCompare.error.could.not.render.generated.svg"; + public static final String ERROR_COULD_NOT_RENDER_GENERATED_SVG = "JPainterCompare.error.could.not.render.generated.svg"; - public static String CONFIG_TMP_FILE_PREFIX = "JPainterCompare.config.tmp.file.prefix"; + public static final String CONFIG_TMP_FILE_PREFIX = "JPainterCompare.config.tmp.file.prefix"; /** * Builds an SVGGraphics2D with a default configuration. diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGAccuracyTest.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGAccuracyTest.java index e400d1549..fc40c60ac 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGAccuracyTest.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGAccuracyTest.java @@ -121,7 +121,7 @@ void runTest(boolean expectError) throws IOException, FontFormatException { if (failMessage != null) { save(bos.toByteArray()); if (!expectError) { - fail("File: " + refURL.toExternalForm() + '\n' + failMessage); + fail("File: " + refURL.toExternalForm() + '\n' + failMessage); } } else if (expectError) { fail("Expected accuracy error but found no error, on file: " + refURL.toExternalForm()); diff --git a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGGeneratorTests.java b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGGeneratorTest.java similarity index 98% rename from echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGGeneratorTests.java rename to echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGGeneratorTest.java index ee715a5b0..a6711876f 100644 --- a/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGGeneratorTests.java +++ b/echosvg-test/src/test/java/io/sf/carte/echosvg/svggen/SVGGeneratorTest.java @@ -48,7 +48,7 @@ * @author For later modifications, see Git history. * @version $Id$ */ -public class SVGGeneratorTests { +public class SVGGeneratorTest { private static final String GENERATOR_REFERENCE_BASE; @@ -238,7 +238,7 @@ public void testTransformCollapse() throws Exception { * * @throws IOException * @throws TranscoderException - * @throws FontFormatException + * @throws FontFormatException */ void runTests(String painterClassname) throws IOException, TranscoderException, FontFormatException { String clName = getClass().getPackage().getName() + "." + painterClassname; @@ -297,7 +297,8 @@ private ImageCompareTest makeImageCompareTest(Painter painter, String id, String return t; } - private SVGRenderingAccuracyTest makeSVGRenderingAccuracyTest(Painter painter, String id, String prefix) throws MalformedURLException { + private SVGRenderingAccuracyTest makeSVGRenderingAccuracyTest(Painter painter, String id, String prefix) + throws MalformedURLException { String cl = prefix + getNonQualifiedClassName(painter); String testSource = GENERATOR_REFERENCE_BASE + cl + SVG_EXTENSION; String testReference = GENERATOR_REFERENCE_BASE + RENDERING_DIR + "/" + cl + PNG_EXTENSION; diff --git a/echosvg-transcoder/src/main/java/io/sf/carte/echosvg/transcoder/image/PNGTranscoder.java b/echosvg-transcoder/src/main/java/io/sf/carte/echosvg/transcoder/image/PNGTranscoder.java index 802675b89..5c71ee9d1 100644 --- a/echosvg-transcoder/src/main/java/io/sf/carte/echosvg/transcoder/image/PNGTranscoder.java +++ b/echosvg-transcoder/src/main/java/io/sf/carte/echosvg/transcoder/image/PNGTranscoder.java @@ -110,7 +110,8 @@ public void writeImage(BufferedImage img, TranscoderOutput output) throws Transc WriteAdapter adapter = getWriteAdapter( "io.sf.carte.echosvg.ext.awt.image.codec.png.PNGTranscoderInternalCodecWriteAdapter"); if (adapter == null) { - adapter = getWriteAdapter("io.sf.carte.echosvg.ext.awt.image.codec.imageio.PNGTranscoderImageIOWriteAdapter"); + adapter = getWriteAdapter( + "io.sf.carte.echosvg.ext.awt.image.codec.imageio.PNGTranscoderImageIOWriteAdapter"); } if (adapter == null) { throw new TranscoderException("Could not write PNG file because no WriteAdapter is availble"); diff --git a/gradle.properties b/gradle.properties index 9af3fa68a..550096044 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ # Dependency versions extraJavaModuleInfoVersion=1.8 +checkstyleVersion=10.17.0 grGitVersion=5.2.2 css4jVersion=4.2.2 css4jAwtVersion=4.0