This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git

commit 7dc980c25df5d59648f45a222f591b536373327b
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Tue Nov 17 02:06:58 2026 +0000

    Simplify redundant code
---
 .../org/apache/maven/doxia/index/IndexEntry.java   |   6 +-
 .../org/apache/maven/doxia/macro/toc/TocMacro.java |   4 +-
 .../apache/maven/doxia/parser/AbstractParser.java  |   2 +-
 .../maven/doxia/parser/Xhtml1BaseParser.java       |   4 +-
 .../doxia/sink/impl/EventCapturingSinkProxy.java   |   2 +-
 .../apache/maven/doxia/sink/impl/SinkUtils.java    |   2 +-
 .../maven/doxia/sink/impl/Xhtml5BaseSink.java      |  14 +-
 .../apache/maven/doxia/util/DoxiaStringUtils.java  |   2 +-
 .../org/apache/maven/doxia/util/DoxiaUtils.java    |  12 +-
 .../apache/maven/doxia/util/HtmlEntityUtils.java   |   2 +-
 .../org/apache/maven/doxia/util/HtmlTools.java     |  12 +-
 .../apache/maven/doxia/macro/toc/TocMacroTest.java |  84 ++++-----
 .../maven/doxia/sink/impl/AbstractSinkTest.java    |   2 +-
 .../maven/doxia/sink/impl/SinkTestDocument.java    |   2 +-
 .../maven/doxia/xsd/AbstractXmlValidator.java      |   8 +-
 .../apache/maven/doxia/module/apt/AptParser.java   |  20 ++-
 .../apache/maven/doxia/module/apt/AptUtils.java    |   6 +-
 .../maven/doxia/module/fml/FmlParserTest.java      | 192 ++++++++++-----------
 .../doxia/module/markdown/MarkdownParser.java      |   4 +-
 .../maven/doxia/module/markdown/MarkdownSink.java  |   3 +-
 .../doxia/module/markdown/MarkdownParserTest.java  |   2 +-
 .../apache/maven/doxia/module/xdoc/XdocSink.java   |   2 +-
 .../maven/doxia/sink/SinkEventAttributeSet.java    |   4 +-
 23 files changed, 198 insertions(+), 193 deletions(-)

diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java
index 92637cbe..faa0fe07 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/index/IndexEntry.java
@@ -300,7 +300,7 @@ public class IndexEntry {
     public IndexEntry getFirstEntry() {
         List<IndexEntry> entries = getChildEntries();
 
-        if (entries.size() == 0) {
+        if (entries.isEmpty()) {
             return null;
         }
 
@@ -315,7 +315,7 @@ public class IndexEntry {
     public IndexEntry getLastEntry() {
         List<IndexEntry> entries = getChildEntries();
 
-        if (entries.size() == 0) {
+        if (entries.isEmpty()) {
             return null;
         }
 
@@ -330,7 +330,7 @@ public class IndexEntry {
     public IndexEntry getRootEntry() {
         List<IndexEntry> entries = getChildEntries();
 
-        if (entries.size() == 0) {
+        if (entries.isEmpty()) {
             return null;
         } else if (entries.size() > 1) {
             throw new IllegalStateException("This index has more than one root 
entry");
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
index a3684b1b..e5ea7620 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
@@ -117,7 +117,7 @@ public class TocMacro extends AbstractMacro {
 
     void writeTocForIndexEntry(Sink sink, SinkEventAttributes listAttributes, 
IndexEntry rootEntry) {
         IndexEntry index = rootEntry;
-        if (index.getChildEntries().size() > 0) {
+        if (!index.getChildEntries().isEmpty()) {
             sink.list(listAttributes);
 
             int i = 1;
@@ -150,7 +150,7 @@ public class TocMacro extends AbstractMacro {
         }
 
         if (toDepth > n) {
-            if (sectionIndex.getChildEntries().size() > 0) {
+            if (!sectionIndex.getChildEntries().isEmpty()) {
                 if (fromDepth <= n && isRelevantIndex) {
                     sink.list();
                 }
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
index c6c08881..054aff0f 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
@@ -260,7 +260,7 @@ public abstract class AbstractParser implements Parser, 
MacroExecutor {
         if (emitAnchors) {
             effectiveSinkWrapperFactories.add(new 
CreateAnchorsForIndexEntriesFactory());
         }
-        Collections.sort(effectiveSinkWrapperFactories, 
Collections.reverseOrder(new SinkWrapperFactoryComparator()));
+        effectiveSinkWrapperFactories.sort(Collections.reverseOrder(new 
SinkWrapperFactoryComparator()));
         return effectiveSinkWrapperFactories;
     }
 
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml1BaseParser.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml1BaseParser.java
index 25107a06..38ad9987 100644
--- 
a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml1BaseParser.java
+++ 
b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml1BaseParser.java
@@ -96,7 +96,7 @@ public class Xhtml1BaseParser extends Xhtml5BaseParser {
         }
     }
 
-    static final String mapAlignToStyle(String alignValue) {
+    static String mapAlignToStyle(String alignValue) {
         switch (alignValue) {
             case "center":
             case "left":
@@ -127,7 +127,7 @@ public class Xhtml1BaseParser extends Xhtml5BaseParser {
                 new AttributeMapping(
                         "border",
                         "class",
-                        (v) -> (v != null && !v.equals("0")) ? 
"bodyTableBorder" : null,
+                        v -> v != null && !v.equals("0") ? "bodyTableBorder" : 
null,
                         AttributeMapping.MergeSemantics.PREPEND),
                 new AttributeMapping(
                         "align", "style", Xhtml1BaseParser::mapAlignToStyle, 
AttributeMapping.MergeSemantics.PREPEND));
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/EventCapturingSinkProxy.java
 
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/EventCapturingSinkProxy.java
index ba921862..8499484d 100644
--- 
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/EventCapturingSinkProxy.java
+++ 
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/EventCapturingSinkProxy.java
@@ -28,7 +28,7 @@ import org.apache.maven.doxia.sink.Sink;
 /**
  * A proxy for a Sink which captures all event/method names called on it.
  */
-public class EventCapturingSinkProxy implements InvocationHandler {
+public final class EventCapturingSinkProxy implements InvocationHandler {
 
     private final Sink sink;
     private final List<String> capturedEventNames;
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java
index 0b627c6e..8c366626 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/SinkUtils.java
@@ -33,7 +33,7 @@ import org.apache.maven.doxia.sink.SinkEventAttributes;
  * @author ltheussl
  * @since 1.1
  */
-public class SinkUtils {
+public final class SinkUtils {
 
     /** Do not instantiate. */
     private SinkUtils() {
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index a6e82634..3726725a 100644
--- 
a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++ 
b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -679,10 +679,10 @@ public class Xhtml5BaseSink extends AbstractXmlSink 
implements HtmlMarkup {
     public void figureGraphics(String src, SinkEventAttributes attributes) {
         MutableAttributeSet filtered = convertAndFilterAttributes(attributes, 
SinkUtils.SINK_IMG_ATTRIBUTES);
         if (filtered != null) {
-            filtered.removeAttribute(SinkEventAttributes.SRC.toString());
+            filtered.removeAttribute(SinkEventAttributes.SRC);
         }
 
-        int count = (attributes == null ? 1 : attributes.getAttributeCount() + 
1);
+        int count = attributes == null ? 1 : attributes.getAttributeCount() + 
1;
 
         MutableAttributeSet atts = new SinkEventAttributeSet(count);
 
@@ -964,7 +964,7 @@ public class Xhtml5BaseSink extends AbstractXmlSink 
implements HtmlMarkup {
         MutableAttributeSet att = new SinkEventAttributeSet();
 
         String tableClass = "bodyTable" + (grid ? " bodyTableBorder" : "");
-        if 
(this.tableAttributes.isDefined(SinkEventAttributes.CLASS.toString())) {
+        if (this.tableAttributes.isDefined(SinkEventAttributes.CLASS)) {
             tableClass += " "
                     + this.tableAttributes
                             .getAttribute(SinkEventAttributes.CLASS)
@@ -1011,8 +1011,8 @@ public class Xhtml5BaseSink extends AbstractXmlSink 
implements HtmlMarkup {
 
         String rowClass = evenTableRow ? "a" : "b";
         boolean hidden = false;
-        if (attrs.isDefined(SinkEventAttributes.CLASS.toString())) {
-            String givenRowClass = (String) 
attrs.getAttribute(SinkEventAttributes.CLASS.toString());
+        if (attrs.isDefined(SinkEventAttributes.CLASS)) {
+            String givenRowClass = (String) 
attrs.getAttribute(SinkEventAttributes.CLASS);
             if (HIDDEN_CLASS_PATTERN.matcher(givenRowClass).matches()) {
                 hidden = true;
             }
@@ -1059,7 +1059,7 @@ public class Xhtml5BaseSink extends AbstractXmlSink 
implements HtmlMarkup {
      * @see javax.swing.text.html.HTML.Tag#TD
      */
     private void tableCell(boolean headerRow, SinkEventAttributes attributes) {
-        Tag t = (headerRow ? HtmlMarkup.TH : HtmlMarkup.TD);
+        Tag t = headerRow ? HtmlMarkup.TH : HtmlMarkup.TD;
 
         if (!headerRow
                 && cellCountStack != null
@@ -1130,7 +1130,7 @@ public class Xhtml5BaseSink extends AbstractXmlSink 
implements HtmlMarkup {
      * @see javax.swing.text.html.HTML.Tag#TD
      */
     private void tableCell_(boolean headerRow) {
-        Tag t = (headerRow ? HtmlMarkup.TH : HtmlMarkup.TD);
+        Tag t = headerRow ? HtmlMarkup.TH : HtmlMarkup.TD;
 
         writeEndTag(t);
 
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaStringUtils.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaStringUtils.java
index 8ef29a1c..2d50db95 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaStringUtils.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaStringUtils.java
@@ -24,7 +24,7 @@ package org.apache.maven.doxia.util;
  *
  * @since 2.1.0
  */
-public class DoxiaStringUtils {
+public final class DoxiaStringUtils {
 
     private DoxiaStringUtils() {
         // utility class
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
index 4607eb16..d3da92d2 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
@@ -41,7 +41,7 @@ import org.apache.maven.doxia.sink.SinkEventAttributeSet;
  * @author ltheussl
  * @since 1.1
  */
-public class DoxiaUtils {
+public final class DoxiaUtils {
     /**
      * Checks if the given string corresponds to an internal link,
      * ie it is a link to an anchor within the same document.
@@ -82,12 +82,12 @@ public class DoxiaUtils {
     public static boolean isExternalLink(final String link) {
         String text = link.toLowerCase(Locale.ENGLISH);
 
-        return (text.startsWith("http:/")
+        return text.startsWith("http:/")
                 || text.startsWith("https:/")
                 || text.startsWith("ftp:/")
                 || text.startsWith("mailto:";)
                 || text.startsWith("file:/")
-                || text.contains("://"));
+                || text.contains("://");
     }
 
     /**
@@ -107,7 +107,7 @@ public class DoxiaUtils {
      * @see #isInternalLink(String)
      */
     public static boolean isLocalLink(final String link) {
-        return (!isExternalLink(link) && !isInternalLink(link));
+        return !isExternalLink(link) && !isInternalLink(link);
     }
 
     /**
@@ -289,11 +289,11 @@ public class DoxiaUtils {
     //
 
     private static boolean isAsciiLetter(final char c) {
-        return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'));
+        return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
     }
 
     private static boolean isAsciiDigit(final char c) {
-        return (c >= '0' && c <= '9');
+        return c >= '0' && c <= '9';
     }
 
     /**
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlEntityUtils.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlEntityUtils.java
index 25b7e530..ca204396 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlEntityUtils.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlEntityUtils.java
@@ -27,7 +27,7 @@ import java.util.Map;
  *
  * @since 2.1.0
  */
-public class HtmlEntityUtils {
+public final class HtmlEntityUtils {
 
     private static final Map<String, String> HTML4_ENTITIES = new HashMap<>();
     private static final Map<String, String> XML_ENTITIES = new HashMap<>();
diff --git 
a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java 
b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
index f241e935..c2ad4686 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/util/HtmlTools.java
@@ -34,7 +34,7 @@ import org.apache.maven.doxia.markup.HtmlMarkup;
  * @author <a href="mailto:[email protected]";>Vincent Siveton</a>
  * @since 1.0
  */
-public class HtmlTools {
+public final class HtmlTools {
     private static final Tag[] ALL_TAGS = {
         HtmlMarkup.A,
         HtmlMarkup.ABBR,
@@ -396,10 +396,10 @@ public class HtmlTools {
                         if (isHighSurrogate(c)) {
                             int codePoint = toCodePoint(c, url.charAt(++i));
                             unicode = toChars(codePoint);
-                            bytes = (new String(unicode, 0, 
unicode.length)).getBytes(StandardCharsets.UTF_8);
+                            bytes = new String(unicode, 0, 
unicode.length).getBytes(StandardCharsets.UTF_8);
                         } else {
                             unicode[0] = c;
-                            bytes = (new String(unicode, 0, 
1)).getBytes(StandardCharsets.UTF_8);
+                            bytes = new String(unicode, 0, 
1).getBytes(StandardCharsets.UTF_8);
                         }
 
                         for (byte aByte : bytes) {
@@ -471,7 +471,7 @@ public class HtmlTools {
     private static final char MAX_HIGH_SURROGATE = '\uDBFF';
 
     private static boolean isHighSurrogate(char ch) {
-        return (MIN_HIGH_SURROGATE <= ch && MAX_HIGH_SURROGATE >= ch);
+        return MIN_HIGH_SURROGATE <= ch && MAX_HIGH_SURROGATE >= ch;
     }
 
     private static final int MIN_CODE_POINT = 0x000000;
@@ -479,11 +479,11 @@ public class HtmlTools {
     private static final int MIN_SUPPLEMENTARY_CODE_POINT = 0x10000;
 
     private static boolean isValidCodePoint(int codePoint) {
-        return (MIN_CODE_POINT <= codePoint && MAX_CODE_POINT >= codePoint);
+        return MIN_CODE_POINT <= codePoint && MAX_CODE_POINT >= codePoint;
     }
 
     private static boolean isSupplementaryCodePoint(int codePoint) {
-        return (MIN_SUPPLEMENTARY_CODE_POINT <= codePoint && MAX_CODE_POINT >= 
codePoint);
+        return MIN_SUPPLEMENTARY_CODE_POINT <= codePoint && MAX_CODE_POINT >= 
codePoint;
     }
 
     /**
diff --git 
a/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java 
b/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
index c4b4ce6f..03cd31d3 100644
--- 
a/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
+++ 
b/doxia-core/src/test/java/org/apache/maven/doxia/macro/toc/TocMacroTest.java
@@ -71,37 +71,37 @@ class TocMacroTest {
         macro.execute(sink, request);
 
         Iterator<SinkEventElement> it = sink.getEventList().iterator();
-        assertEquals("list", (it.next()).getName());
-        assertEquals("listItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("listItem_", (it.next()).getName());
-        assertEquals("listItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("list", (it.next()).getName());
-        assertEquals("listItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("list", (it.next()).getName());
-        assertEquals("listItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("listItem_", (it.next()).getName());
-        assertEquals("list_", (it.next()).getName());
-        assertEquals("listItem_", (it.next()).getName());
-        assertEquals("list_", (it.next()).getName());
-        assertEquals("listItem_", (it.next()).getName());
-        assertEquals("listItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("listItem_", (it.next()).getName());
-        assertEquals("list_", (it.next()).getName());
+        assertEquals("list", it.next().getName());
+        assertEquals("listItem", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("listItem_", it.next().getName());
+        assertEquals("listItem", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("list", it.next().getName());
+        assertEquals("listItem", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("list", it.next().getName());
+        assertEquals("listItem", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("listItem_", it.next().getName());
+        assertEquals("list_", it.next().getName());
+        assertEquals("listItem_", it.next().getName());
+        assertEquals("list_", it.next().getName());
+        assertEquals("listItem_", it.next().getName());
+        assertEquals("listItem", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("listItem_", it.next().getName());
+        assertEquals("list_", it.next().getName());
         assertFalse(it.hasNext());
 
         // test parameters
@@ -122,23 +122,23 @@ class TocMacroTest {
         SinkEventAttributeSet atts = (SinkEventAttributeSet) 
event.getArgs()[0];
         assertEquals("myId", atts.getAttribute("id"));
         assertEquals("myClass", atts.getAttribute("class"));
-        assertEquals("listItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
+        assertEquals("listItem", it.next().getName());
+        assertEquals("link", it.next().getName());
         event = it.next();
         assertEquals("text", event.getName());
         assertEquals("h12", event.getArgs()[0]);
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("list", (it.next()).getName());
-        assertEquals("listItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("list", it.next().getName());
+        assertEquals("listItem", it.next().getName());
+        assertEquals("link", it.next().getName());
         event = it.next();
         assertEquals("text", event.getName());
         assertEquals("h2", event.getArgs()[0]);
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("listItem_", (it.next()).getName());
-        assertEquals("list_", (it.next()).getName());
-        assertEquals("listItem_", (it.next()).getName());
-        assertEquals("list_", (it.next()).getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("listItem_", it.next().getName());
+        assertEquals("list_", it.next().getName());
+        assertEquals("listItem_", it.next().getName());
+        assertEquals("list_", it.next().getName());
         assertFalse(it.hasNext());
     }
 
diff --git 
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
 
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
index 39de4064..ad4beb94 100644
--- 
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
+++ 
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractSinkTest.java
@@ -102,7 +102,7 @@ public abstract class AbstractSinkTest extends 
AbstractModuleTest {
      */
     @Test
     public final void document() throws Exception {
-        Writer writer = (isXmlSink() ? getXmlTestWriter("testDocument") : 
getTestWriter("testDocument"));
+        Writer writer = isXmlSink() ? getXmlTestWriter("testDocument") : 
getTestWriter("testDocument");
 
         try (Sink testSink = createSink(writer)) {
             SinkTestDocument.generate(testSink);
diff --git 
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java
 
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java
index 548615bb..cb45983f 100644
--- 
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java
+++ 
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkTestDocument.java
@@ -24,7 +24,7 @@ import org.apache.maven.doxia.sink.SinkEventAttributeSet;
 /**
  * Static methods to generate standard Doxia sink events.
  */
-public class SinkTestDocument {
+public final class SinkTestDocument {
 
     /** Private constructor. */
     private SinkTestDocument() {
diff --git 
a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java 
b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
index 84124e21..f50b89ee 100644
--- 
a/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
+++ 
b/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
@@ -273,11 +273,11 @@ public abstract class AbstractXmlValidator {
             final int prime = 31;
             int result = 1;
             result = prime * result + columnNumber;
-            result = prime * result + ((level == null) ? 0 : level.hashCode());
+            result = prime * result + (level == null ? 0 : level.hashCode());
             result = prime * result + lineNumber;
-            result = prime * result + ((message == null) ? 0 : 
message.hashCode());
-            result = prime * result + ((publicID == null) ? 0 : 
publicID.hashCode());
-            result = prime * result + ((systemID == null) ? 0 : 
systemID.hashCode());
+            result = prime * result + (message == null ? 0 : 
message.hashCode());
+            result = prime * result + (publicID == null ? 0 : 
publicID.hashCode());
+            result = prime * result + (systemID == null ? 0 : 
systemID.hashCode());
             return result;
         }
 
diff --git 
a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
 
b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
index 54022f38..076026d3 100644
--- 
a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
+++ 
b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
@@ -565,7 +565,7 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
      * @return the character, or '\0' if i &gt; length.
      */
     protected static char charAt(String string, int length, int i) {
-        return (i < length) ? string.charAt(i) : '\0';
+        return i < length ? string.charAt(i) : '\0';
     }
 
     /**
@@ -601,7 +601,8 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
     protected static String replaceAll(String string, String oldSub, String 
newSub) {
         StringBuilder replaced = new StringBuilder();
         int oldSubLength = oldSub.length();
-        int begin, end;
+        int begin;
+        int end;
 
         begin = 0;
         while ((end = string.indexOf(oldSub, begin)) >= 0) {
@@ -1059,7 +1060,9 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
      */
     private void nextBlock(boolean firstBlock) throws AptParseException {
         // Skip open lines.
-        int length, indent, i;
+        int length;
+        int indent;
+        int i;
 
         skipLoop:
         for (; ; ) {
@@ -1222,7 +1225,7 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
      * @return boolean
      */
     private static boolean isOctalChar(char c) {
-        return (c >= '0' && c <= '7');
+        return c >= '0' && c <= '7';
     }
 
     /**
@@ -1232,7 +1235,7 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
      * @return boolean
      */
     private static boolean isHexChar(char c) {
-        return ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' 
&& c <= 'F'));
+        return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' 
&& c <= 'F');
     }
 
     /**
@@ -1867,7 +1870,7 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
 
             StringBuilder buffer = new StringBuilder();
             char firstChar = firstLine.charAt(0);
-            source = (firstChar == PLUS);
+            source = firstChar == PLUS;
 
             while (AptParser.this.line != null) {
                 String l = AptParser.this.line;
@@ -1883,7 +1886,8 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
 
                 // Expand tabs ---
 
-                int prevColumn, column;
+                int prevColumn;
+                int column;
 
                 column = 0;
 
@@ -2020,7 +2024,7 @@ public class AptParser extends AbstractTextParser 
implements AptMarkup {
                 } else {
                     if (init == 1) {
                         init = 0;
-                        grid = (AptParser.charAt(line, lineLength, 0) == PIPE);
+                        grid = AptParser.charAt(line, lineLength, 0) == PIPE;
                         AptParser.this.sink.tableRows(justification, grid);
                     }
 
diff --git 
a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java
 
b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java
index 69c107f9..fc9712a0 100644
--- 
a/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java
+++ 
b/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.java
@@ -26,7 +26,7 @@ import org.apache.maven.doxia.util.DoxiaUtils;
  * @author ltheussl
  * @since 1.1
  */
-public class AptUtils {
+public final class AptUtils {
 
     /**
      * Checks if the given string corresponds to an external URI,
@@ -56,7 +56,7 @@ public class AptUtils {
      * @see #isLocalLink(String)
      */
     public static boolean isInternalLink(String link) {
-        return (!isExternalLink(link) && !isLocalLink(link));
+        return !isExternalLink(link) && !isLocalLink(link);
     }
 
     /**
@@ -70,7 +70,7 @@ public class AptUtils {
      * @see #isInternalLink(String)
      */
     public static boolean isLocalLink(String link) {
-        return (link.startsWith("/") || link.startsWith("./") || 
link.startsWith("../"));
+        return link.startsWith("/") || link.startsWith("./") || 
link.startsWith("../");
     }
 
     private AptUtils() {
diff --git 
a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
 
b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
index a878e513..2fbf5cec 100644
--- 
a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
+++ 
b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
@@ -95,57 +95,57 @@ class FmlParserTest extends AbstractParserTest {
 
         Iterator<SinkEventElement> it = sink.getEventList().iterator();
 
-        assertEquals("comment", (it.next()).getName());
-        assertEquals("head", (it.next()).getName());
-        assertEquals("title", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("title_", (it.next()).getName());
-        assertEquals("head_", (it.next()).getName());
-        assertEquals("body", (it.next()).getName());
-        assertEquals("section1", (it.next()).getName());
-        assertEquals("anchor", (it.next()).getName());
-        assertEquals("anchor_", (it.next()).getName());
-        assertEquals("sectionTitle1", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("sectionTitle1_", (it.next()).getName());
-        assertEquals("paragraph", (it.next()).getName());
-        assertEquals("inline", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("inline_", (it.next()).getName());
-        assertEquals("paragraph_", (it.next()).getName());
-        assertEquals("numberedList", (it.next()).getName());
-        assertEquals("numberedListItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("numberedListItem_", (it.next()).getName());
-        assertEquals("numberedList_", (it.next()).getName());
-        assertEquals("section1_", (it.next()).getName());
-        assertEquals("section1", (it.next()).getName());
-        assertEquals("anchor", (it.next()).getName());
-        assertEquals("anchor_", (it.next()).getName());
-        assertEquals("sectionTitle1", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("sectionTitle1_", (it.next()).getName());
-        assertEquals("definitionList", (it.next()).getName());
-        assertEquals("anchor", (it.next()).getName());
-        assertEquals("anchor_", (it.next()).getName());
-        assertEquals("definedTerm", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("definedTerm_", (it.next()).getName());
-        assertEquals("definition", (it.next()).getName());
-        assertEquals("paragraph", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("paragraph_", (it.next()).getName());
-        assertEquals("paragraph", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("paragraph_", (it.next()).getName());
-        assertEquals("definition_", (it.next()).getName());
-        assertEquals("definitionList_", (it.next()).getName());
-        assertEquals("section1_", (it.next()).getName());
-        assertEquals("body_", (it.next()).getName());
+        assertEquals("comment", it.next().getName());
+        assertEquals("head", it.next().getName());
+        assertEquals("title", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("title_", it.next().getName());
+        assertEquals("head_", it.next().getName());
+        assertEquals("body", it.next().getName());
+        assertEquals("section1", it.next().getName());
+        assertEquals("anchor", it.next().getName());
+        assertEquals("anchor_", it.next().getName());
+        assertEquals("sectionTitle1", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("sectionTitle1_", it.next().getName());
+        assertEquals("paragraph", it.next().getName());
+        assertEquals("inline", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("inline_", it.next().getName());
+        assertEquals("paragraph_", it.next().getName());
+        assertEquals("numberedList", it.next().getName());
+        assertEquals("numberedListItem", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("numberedListItem_", it.next().getName());
+        assertEquals("numberedList_", it.next().getName());
+        assertEquals("section1_", it.next().getName());
+        assertEquals("section1", it.next().getName());
+        assertEquals("anchor", it.next().getName());
+        assertEquals("anchor_", it.next().getName());
+        assertEquals("sectionTitle1", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("sectionTitle1_", it.next().getName());
+        assertEquals("definitionList", it.next().getName());
+        assertEquals("anchor", it.next().getName());
+        assertEquals("anchor_", it.next().getName());
+        assertEquals("definedTerm", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("definedTerm_", it.next().getName());
+        assertEquals("definition", it.next().getName());
+        assertEquals("paragraph", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("paragraph_", it.next().getName());
+        assertEquals("paragraph", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("paragraph_", it.next().getName());
+        assertEquals("definition_", it.next().getName());
+        assertEquals("definitionList_", it.next().getName());
+        assertEquals("section1_", it.next().getName());
+        assertEquals("body_", it.next().getName());
         assertFalse(it.hasNext());
     }
 
@@ -165,87 +165,87 @@ class FmlParserTest extends AbstractParserTest {
 
         Iterator<SinkEventElement> it = sink.getEventList().iterator();
 
-        assertEquals("head", (it.next()).getName());
-        assertEquals("title", (it.next()).getName());
+        assertEquals("head", it.next().getName());
+        assertEquals("title", it.next().getName());
 
         // head title TODO: should be two events
         assertTextEvent(it.next(), "&&#913;");
 
-        assertEquals("title_", (it.next()).getName());
-        assertEquals("head_", (it.next()).getName());
-        assertEquals("body", (it.next()).getName());
-        assertEquals("section1", (it.next()).getName());
-        assertEquals("anchor", (it.next()).getName());
-        assertEquals("anchor_", (it.next()).getName());
-        assertEquals("sectionTitle1", (it.next()).getName());
+        assertEquals("title_", it.next().getName());
+        assertEquals("head_", it.next().getName());
+        assertEquals("body", it.next().getName());
+        assertEquals("section1", it.next().getName());
+        assertEquals("anchor", it.next().getName());
+        assertEquals("anchor_", it.next().getName());
+        assertEquals("sectionTitle1", it.next().getName());
 
         // faq title TODO: should be two events
         assertTextEvent(it.next(), "&&#913;");
 
-        assertEquals("sectionTitle1_", (it.next()).getName());
-        assertEquals("paragraph", (it.next()).getName());
-        assertEquals("inline", (it.next()).getName());
+        assertEquals("sectionTitle1_", it.next().getName());
+        assertEquals("paragraph", it.next().getName());
+        assertEquals("inline", it.next().getName());
 
         // part title in TOC
         assertTextEvent(it.next(), "<");
         assertTextEvent(it.next(), "\u0391");
 
-        assertEquals("inline_", (it.next()).getName());
-        assertEquals("paragraph_", (it.next()).getName());
-        assertEquals("numberedList", (it.next()).getName());
-        assertEquals("numberedListItem", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
+        assertEquals("inline_", it.next().getName());
+        assertEquals("paragraph_", it.next().getName());
+        assertEquals("numberedList", it.next().getName());
+        assertEquals("numberedListItem", it.next().getName());
+        assertEquals("link", it.next().getName());
 
         // question in TOC
         assertTextEvent(it.next(), ">");
         assertTextEvent(it.next(), "\u0391");
 
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("numberedListItem_", (it.next()).getName());
-        assertEquals("numberedList_", (it.next()).getName());
-        assertEquals("section1_", (it.next()).getName());
-        assertEquals("section1", (it.next()).getName());
-        assertEquals("anchor", (it.next()).getName());
-        assertEquals("anchor_", (it.next()).getName());
-        assertEquals("sectionTitle1", (it.next()).getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("numberedListItem_", it.next().getName());
+        assertEquals("numberedList_", it.next().getName());
+        assertEquals("section1_", it.next().getName());
+        assertEquals("section1", it.next().getName());
+        assertEquals("anchor", it.next().getName());
+        assertEquals("anchor_", it.next().getName());
+        assertEquals("sectionTitle1", it.next().getName());
 
         // part title
         assertTextEvent(it.next(), "<");
         assertTextEvent(it.next(), "\u0391");
 
-        assertEquals("sectionTitle1_", (it.next()).getName());
-        assertEquals("definitionList", (it.next()).getName());
-        assertEquals("anchor", (it.next()).getName());
-        assertEquals("anchor_", (it.next()).getName());
-        assertEquals("definedTerm", (it.next()).getName());
+        assertEquals("sectionTitle1_", it.next().getName());
+        assertEquals("definitionList", it.next().getName());
+        assertEquals("anchor", it.next().getName());
+        assertEquals("anchor_", it.next().getName());
+        assertEquals("definedTerm", it.next().getName());
 
         // question
         assertTextEvent(it.next(), ">");
         assertTextEvent(it.next(), "\u0391");
 
-        assertEquals("definedTerm_", (it.next()).getName());
-        assertEquals("definition", (it.next()).getName());
-        assertEquals("paragraph", (it.next()).getName());
+        assertEquals("definedTerm_", it.next().getName());
+        assertEquals("definition", it.next().getName());
+        assertEquals("paragraph", it.next().getName());
 
         // answer
-        assertEquals("inline", (it.next()).getName());
+        assertEquals("inline", it.next().getName());
         assertTextEvent(it.next(), "<");
         assertTextEvent(it.next(), "img");
         assertTextEvent(it.next(), ">");
-        assertEquals("inline_", (it.next()).getName());
+        assertEquals("inline_", it.next().getName());
         assertTextEvent(it.next(), "\"");
         assertTextEvent(it.next(), "\u0391");
 
-        assertEquals("paragraph_", (it.next()).getName());
-        assertEquals("paragraph", (it.next()).getName());
-        assertEquals("link", (it.next()).getName());
-        assertEquals("text", (it.next()).getName());
-        assertEquals("link_", (it.next()).getName());
-        assertEquals("paragraph_", (it.next()).getName());
-        assertEquals("definition_", (it.next()).getName());
-        assertEquals("definitionList_", (it.next()).getName());
-        assertEquals("section1_", (it.next()).getName());
-        assertEquals("body_", (it.next()).getName());
+        assertEquals("paragraph_", it.next().getName());
+        assertEquals("paragraph", it.next().getName());
+        assertEquals("link", it.next().getName());
+        assertEquals("text", it.next().getName());
+        assertEquals("link_", it.next().getName());
+        assertEquals("paragraph_", it.next().getName());
+        assertEquals("definition_", it.next().getName());
+        assertEquals("definitionList_", it.next().getName());
+        assertEquals("section1_", it.next().getName());
+        assertEquals("body_", it.next().getName());
 
         assertFalse(it.hasNext());
     }
diff --git 
a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
 
b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
index 06d15837..b9f2b9c5 100644
--- 
a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
+++ 
b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
@@ -306,12 +306,12 @@ public class MarkdownParser extends AbstractTextParser 
implements TextMarkup {
         if (!haveTitle && documentRoot.hasChildren()) {
             // Skip the comment nodes
             Node firstNode = documentRoot.getFirstChild();
-            while (firstNode != null && firstNode instanceof HtmlCommentBlock) 
{
+            while (firstNode instanceof HtmlCommentBlock) {
                 firstNode = firstNode.getNext();
             }
 
             // If this first non-comment node is a heading, we use it as the 
document title
-            if (firstNode != null && firstNode instanceof Heading) {
+            if (firstNode instanceof Heading) {
                 html.append("<title>");
                 TextCollectingVisitor collectingVisitor = new 
TextCollectingVisitor();
                 String headingText = 
collectingVisitor.collectAndGetText(firstNode);
diff --git 
a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
 
b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
index ea534e74..4a9ba747 100644
--- 
a/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
+++ 
b/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
  * <b>Note</b>: The encoding used is UTF-8.
  * Extends the Xhtml5 sink as in some context HTML needs to be emitted.
  */
-public class MarkdownSink extends Xhtml5BaseSink implements MarkdownMarkup {
+public final class MarkdownSink extends Xhtml5BaseSink implements 
MarkdownMarkup {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(MarkdownSink.class);
 
     // ----------------------------------------------------------------------
@@ -102,6 +102,7 @@ public class MarkdownSink extends Xhtml5BaseSink implements 
MarkdownMarkup {
     interface TextEscapeFunction {
         String escape(ElementContext context, LastTwoLinesAwareWriter writer, 
String text);
     }
+
     /** Most important contextual metadata (of elements). This contains 
information about necessary escaping rules, potential prefixes and newlines */
     enum ElementContext {
         ROOT_WITH_BUFFERING(
diff --git 
a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
 
b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
index 568ba6f1..587d2c93 100644
--- 
a/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
+++ 
b/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java
@@ -652,7 +652,7 @@ class MarkdownParserTest extends AbstractParserTest {
 
     protected String parseFileToHtml(String file) throws ParseException, 
IOException {
         try (Reader reader = getTestReader(file)) {
-            return parser.toXhtml(reader).toString();
+            return parser.toXhtml(reader);
         }
     }
 
diff --git 
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
index 30b7cccd..521f7e10 100644
--- 
a/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
+++ 
b/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
@@ -385,7 +385,7 @@ public class XdocSink extends Xhtml5BaseSink implements 
XdocMarkup {
         MutableAttributeSet att = new SinkEventAttributeSet();
 
         if (!tableAttributes.isDefined(SinkEventAttributes.BORDER)) {
-            att.addAttribute(SinkEventAttributes.BORDER, (grid ? "1" : "0"));
+            att.addAttribute(SinkEventAttributes.BORDER, grid ? "1" : "0");
         }
 
         att.addAttributes(tableAttributes);
diff --git 
a/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
 
b/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
index d0531abf..52b06742 100644
--- 
a/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
+++ 
b/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
@@ -208,7 +208,7 @@ public class SinkEventAttributeSet implements 
SinkEventAttributes, Cloneable {
     }
 
     public boolean isEqual(AttributeSet attr) {
-        return ((getAttributeCount() == attr.getAttributeCount()) && 
containsAttributes(attr));
+        return (getAttributeCount() == attr.getAttributeCount()) && 
containsAttributes(attr);
     }
 
     /**
@@ -217,7 +217,7 @@ public class SinkEventAttributeSet implements 
SinkEventAttributes, Cloneable {
      * @return a {@link javax.swing.text.AttributeSet} object.
      */
     public AttributeSet copyAttributes() {
-        return ((AttributeSet) clone());
+        return (AttributeSet) clone();
     }
 
     /**

Reply via email to