From 5bacddc3388203f27ec0fa119c2537da3e5ed2dc Mon Sep 17 00:00:00 2001 From: Jan Ortner Date: Fri, 10 Jun 2016 21:58:24 +0200 Subject: [PATCH] 232: Missing Overrides Added missing Overrides fixes #232 --- src/main/java/org/pegdown/Parser.java | 18 ++- .../java/org/pegdown/ToHtmlSerializer.java | 114 ++++++++++++------ .../java/org/pegdown/ast/AbstractNode.java | 6 +- src/main/java/org/pegdown/ast/SimpleNode.java | 6 +- src/main/java/org/pegdown/ast/SuperNode.java | 6 +- src/main/java/org/pegdown/ast/TextNode.java | 6 +- .../ast/ValidEmphOrStrongCloseNode.java | 6 +- src/test/java/org/pegdown/Benchmark.java | 3 +- 8 files changed, 110 insertions(+), 55 deletions(-) diff --git a/src/main/java/org/pegdown/Parser.java b/src/main/java/org/pegdown/Parser.java index 90b0ca7..9215e9d 100644 --- a/src/main/java/org/pegdown/Parser.java +++ b/src/main/java/org/pegdown/Parser.java @@ -59,7 +59,8 @@ public interface ParseRunnerProvider { public static ParseRunnerProvider DefaultParseRunnerProvider = new Parser.ParseRunnerProvider() { - public ParseRunner get(Rule rule) { + @Override + public ParseRunner get(Rule rule) { return new ReportingParseRunner(rule); } }; @@ -401,7 +402,8 @@ public Rule DefTermInline() { public Rule Definition() { SuperNodeCreator itemNodeCreator = new SuperNodeCreator() { - public SuperNode create(Node child) { + @Override + public SuperNode create(Node child) { return new DefinitionNode(child); } }; @@ -418,11 +420,13 @@ public Rule BulletList() { if (ext(TASKLISTITEMS)) { // #185 GFM style task list items [ ] open task, [x] closed task handlings SuperNodeTaskItemCreator itemNodeCreator = new SuperNodeTaskItemCreator() { - public SuperNode create(Node child) { + @Override + public SuperNode create(Node child) { return new ListItemNode(child); } - public SuperNode create(Node child, int taskType, String taskListMarker) { + @Override + public SuperNode create(Node child, int taskType, String taskListMarker) { return taskType == 0 ? new ListItemNode(child) : new TaskListNode(child, taskType == 2, taskListMarker); } }; @@ -436,7 +440,8 @@ public SuperNode create(Node child, int taskType, String taskListMarker) { ); } else { SuperNodeCreator itemNodeCreator = new SuperNodeCreator() { - public SuperNode create(Node child) { + @Override + public SuperNode create(Node child) { return new ListItemNode(child); } }; @@ -453,7 +458,8 @@ public SuperNode create(Node child) { public Rule OrderedList() { SuperNodeCreator itemNodeCreator = new SuperNodeCreator() { - public SuperNode create(Node child) { + @Override + public SuperNode create(Node child) { return new ListItemNode(child); } }; diff --git a/src/main/java/org/pegdown/ToHtmlSerializer.java b/src/main/java/org/pegdown/ToHtmlSerializer.java index 0f42ff8..8aeeab6 100644 --- a/src/main/java/org/pegdown/ToHtmlSerializer.java +++ b/src/main/java/org/pegdown/ToHtmlSerializer.java @@ -71,7 +71,8 @@ public String toHtml(RootNode astRoot) { return printer.getString(); } - public void visit(RootNode node) { + @Override + public void visit(RootNode node) { for (ReferenceNode refNode : node.getReferences()) { visitChildren(refNode); references.put(normalize(printer.getString()), refNode); @@ -89,66 +90,81 @@ public void visit(RootNode node) { visitChildren(node); } - public void visit(AbbreviationNode node) { + @Override + public void visit(AbbreviationNode node) { } - public void visit(AnchorLinkNode node) { + @Override + public void visit(AnchorLinkNode node) { printLink(linkRenderer.render(node)); } - public void visit(AutoLinkNode node) { + @Override + public void visit(AutoLinkNode node) { printLink(linkRenderer.render(node)); } - public void visit(BlockQuoteNode node) { + @Override + public void visit(BlockQuoteNode node) { printIndentedTag(node, "blockquote"); } - public void visit(BulletListNode node) { + @Override + public void visit(BulletListNode node) { printIndentedTag(node, "ul"); } - public void visit(CodeNode node) { + @Override + public void visit(CodeNode node) { printTag(node, "code"); } - public void visit(DefinitionListNode node) { + @Override + public void visit(DefinitionListNode node) { printIndentedTag(node, "dl"); } - public void visit(DefinitionNode node) { + @Override + public void visit(DefinitionNode node) { printConditionallyIndentedTag(node, "dd"); } - public void visit(DefinitionTermNode node) { + @Override + public void visit(DefinitionTermNode node) { printConditionallyIndentedTag(node, "dt"); } - public void visit(ExpImageNode node) { + @Override + public void visit(ExpImageNode node) { String text = printChildrenToString(node); printImageTag(linkRenderer.render(node, text)); } - public void visit(ExpLinkNode node) { + @Override + public void visit(ExpLinkNode node) { String text = printChildrenToString(node); printLink(linkRenderer.render(node, text)); } - public void visit(HeaderNode node) { + @Override + public void visit(HeaderNode node) { printBreakBeforeTag(node, "h" + node.getLevel()); } - public void visit(HtmlBlockNode node) { + @Override + public void visit(HtmlBlockNode node) { String text = node.getText(); if (text.length() > 0) printer.println(); printer.print(text); } - public void visit(InlineHtmlNode node) { + @Override + public void visit(InlineHtmlNode node) { printer.print(node.getText()); } - public void visit(ListItemNode node) { + @Override + public void visit(ListItemNode node) { if (node instanceof TaskListNode) { // vsch: #185 handle GitHub style task list items, these are a bit messy because the checkbox needs to be // included inside the optional

first grand-child of the list item, first child is always RootNode @@ -178,19 +194,23 @@ public void visit(ListItemNode node) { } } - public void visit(MailLinkNode node) { + @Override + public void visit(MailLinkNode node) { printLink(linkRenderer.render(node)); } - public void visit(OrderedListNode node) { + @Override + public void visit(OrderedListNode node) { printIndentedTag(node, "ol"); } - public void visit(ParaNode node) { + @Override + public void visit(ParaNode node) { printBreakBeforeTag(node, "p"); } - public void visit(QuotedNode node) { + @Override + public void visit(QuotedNode node) { switch (node.getType()) { case DoubleAngle: printer.print("«"); @@ -210,11 +230,13 @@ public void visit(QuotedNode node) { } } - public void visit(ReferenceNode node) { + @Override + public void visit(ReferenceNode node) { // reference nodes are not printed } - public void visit(RefImageNode node) { + @Override + public void visit(RefImageNode node) { String text = printChildrenToString(node); String key = node.referenceKey != null ? printChildrenToString(node.referenceKey) : text; ReferenceNode refNode = references.get(normalize(key)); @@ -228,7 +250,8 @@ public void visit(RefImageNode node) { } else printImageTag(linkRenderer.render(node, refNode.getUrl(), refNode.getTitle(), text)); } - public void visit(RefLinkNode node) { + @Override + public void visit(RefLinkNode node) { String text = printChildrenToString(node); String key = node.referenceKey != null ? printChildrenToString(node.referenceKey) : text; ReferenceNode refNode = references.get(normalize(key)); @@ -242,7 +265,8 @@ public void visit(RefLinkNode node) { } else printLink(linkRenderer.render(node, refNode.getUrl(), refNode.getTitle(), text)); } - public void visit(SimpleNode node) { + @Override + public void visit(SimpleNode node) { switch (node.getType()) { case Apostrophe: printer.print("’"); @@ -270,7 +294,8 @@ public void visit(SimpleNode node) { } } - public void visit(StrongEmphSuperNode node) { + @Override + public void visit(StrongEmphSuperNode node) { if (node.isClosed()) { if (node.isStrong()) printTag(node, "strong"); @@ -283,11 +308,13 @@ public void visit(StrongEmphSuperNode node) { } } - public void visit(StrikeNode node) { + @Override + public void visit(StrikeNode node) { printTag(node, "del"); } - public void visit(TableBodyNode node) { + @Override + public void visit(TableBodyNode node) { printIndentedTag(node, "tbody"); } @@ -298,7 +325,8 @@ public void visit(TableCaptionNode node) { printer.print(""); } - public void visit(TableCellNode node) { + @Override + public void visit(TableCellNode node) { String tag = inTableHeader ? "th" : "td"; List columns = currentTableNode.getColumns(); TableColumnNode column = columns.get(Math.min(currentTableColumn, columns.size() - 1)); @@ -313,7 +341,8 @@ public void visit(TableCellNode node) { currentTableColumn += node.getColSpan(); } - public void visit(TableColumnNode node) { + @Override + public void visit(TableColumnNode node) { switch (node.getAlignment()) { case None: break; @@ -331,24 +360,28 @@ public void visit(TableColumnNode node) { } } - public void visit(TableHeaderNode node) { + @Override + public void visit(TableHeaderNode node) { inTableHeader = true; printIndentedTag(node, "thead"); inTableHeader = false; } - public void visit(TableNode node) { + @Override + public void visit(TableNode node) { currentTableNode = node; printIndentedTag(node, "table"); currentTableNode = null; } - public void visit(TableRowNode node) { + @Override + public void visit(TableRowNode node) { currentTableColumn = 0; printIndentedTag(node, "tr"); } - public void visit(VerbatimNode node) { + @Override + public void visit(VerbatimNode node) { VerbatimSerializer serializer = lookupSerializer(node.getType()); serializer.serialize(node, printer); } @@ -361,11 +394,13 @@ protected VerbatimSerializer lookupSerializer(final String type) { } } - public void visit(WikiLinkNode node) { + @Override + public void visit(WikiLinkNode node) { printLink(linkRenderer.render(node)); } - public void visit(TextNode node) { + @Override + public void visit(TextNode node) { if (abbreviations.isEmpty()) { printer.print(node.getText()); } else { @@ -373,15 +408,18 @@ public void visit(TextNode node) { } } - public void visit(SpecialTextNode node) { + @Override + public void visit(SpecialTextNode node) { printer.printEncoded(node.getText()); } - public void visit(SuperNode node) { + @Override + public void visit(SuperNode node) { visitChildren(node); } - public void visit(Node node) { + @Override + public void visit(Node node) { for (ToHtmlSerializerPlugin plugin : plugins) { if (plugin.visit(node, this, printer)) { return; diff --git a/src/main/java/org/pegdown/ast/AbstractNode.java b/src/main/java/org/pegdown/ast/AbstractNode.java index 9912864..577f4ab 100644 --- a/src/main/java/org/pegdown/ast/AbstractNode.java +++ b/src/main/java/org/pegdown/ast/AbstractNode.java @@ -4,11 +4,13 @@ public abstract class AbstractNode implements Node { private int startIndex; private int endIndex; - public int getStartIndex() { + @Override + public int getStartIndex() { return startIndex; } - public int getEndIndex() { + @Override + public int getEndIndex() { return endIndex; } diff --git a/src/main/java/org/pegdown/ast/SimpleNode.java b/src/main/java/org/pegdown/ast/SimpleNode.java index 6621e90..6847918 100644 --- a/src/main/java/org/pegdown/ast/SimpleNode.java +++ b/src/main/java/org/pegdown/ast/SimpleNode.java @@ -35,11 +35,13 @@ public Type getType() { return type; } - public List getChildren() { + @Override + public List getChildren() { return ImmutableList.of(); } - public void accept(Visitor visitor) { + @Override + public void accept(Visitor visitor) { visitor.visit(this); } diff --git a/src/main/java/org/pegdown/ast/SuperNode.java b/src/main/java/org/pegdown/ast/SuperNode.java index 1f62124..0080f1f 100644 --- a/src/main/java/org/pegdown/ast/SuperNode.java +++ b/src/main/java/org/pegdown/ast/SuperNode.java @@ -35,11 +35,13 @@ public SuperNode(List children) { this.children.addAll(children); } - public List getChildren() { + @Override + public List getChildren() { return children; } - public void accept(Visitor visitor) { + @Override + public void accept(Visitor visitor) { visitor.visit(this); } diff --git a/src/main/java/org/pegdown/ast/TextNode.java b/src/main/java/org/pegdown/ast/TextNode.java index 2617a67..aeedbe5 100644 --- a/src/main/java/org/pegdown/ast/TextNode.java +++ b/src/main/java/org/pegdown/ast/TextNode.java @@ -43,11 +43,13 @@ public String toString() { return super.toString() + " '" + StringUtils.escape(getText()) + '\''; } - public List getChildren() { + @Override + public List getChildren() { return ImmutableList.of(); } - public void accept(Visitor visitor) { + @Override + public void accept(Visitor visitor) { visitor.visit(this); } } diff --git a/src/main/java/org/pegdown/ast/ValidEmphOrStrongCloseNode.java b/src/main/java/org/pegdown/ast/ValidEmphOrStrongCloseNode.java index 76a6e9c..0dece27 100644 --- a/src/main/java/org/pegdown/ast/ValidEmphOrStrongCloseNode.java +++ b/src/main/java/org/pegdown/ast/ValidEmphOrStrongCloseNode.java @@ -27,11 +27,13 @@ public class ValidEmphOrStrongCloseNode extends AbstractNode { public ValidEmphOrStrongCloseNode() { } - public List getChildren() { + @Override + public List getChildren() { return ImmutableList.of(); } - public void accept(Visitor visitor) { + @Override + public void accept(Visitor visitor) { visitor.visit(this); } } \ No newline at end of file diff --git a/src/test/java/org/pegdown/Benchmark.java b/src/test/java/org/pegdown/Benchmark.java index ac9bcbf..3ce9802 100644 --- a/src/test/java/org/pegdown/Benchmark.java +++ b/src/test/java/org/pegdown/Benchmark.java @@ -68,7 +68,8 @@ public static void main(String[] args) { System.out.println("Parsing benchmark once more with ProfileParseRunner..."); final Reference> profilingRunner = new Reference>(); Parser parser = Parboiled.createParser(Parser.class, Extensions.NONE, new Parser.ParseRunnerProvider() { - public ParseRunner get(Rule rule) { + @Override + public ParseRunner get(Rule rule) { if (profilingRunner.isNotSet()) profilingRunner.set(new ProfilingParseRunner(rule)); return profilingRunner.get(); }