You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2022/02/07 08:04:39 UTC
[jackrabbit-oak] branch OAK-9681 created (now c6ac33e)
This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a change to branch OAK-9681
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git.
at c6ac33e OAK-9681 oak-doc-railroad-macro build broken by h2db update
This branch includes the following new commits:
new c6ac33e OAK-9681 oak-doc-railroad-macro build broken by h2db update
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-9681 oak-doc-railroad-macro build broken by h2db update
Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
thomasm pushed a commit to branch OAK-9681
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit c6ac33ef2ac10c9a41b6ee17ea728b29d54771a1
Author: Thomas Mueller <th...@apache.org>
AuthorDate: Mon Feb 7 09:03:19 2022 +0100
OAK-9681 oak-doc-railroad-macro build broken by h2db update
---
.../org/apache/jackrabbit/oak/doc/doxia/RailroadMacro.java | 4 ++--
.../apache/jackrabbit/oak/doc/doxia/jcr/BnfRailroad.java | 14 +++++++++++++-
.../org/apache/jackrabbit/oak/doc/doxia/jcr/BnfSyntax.java | 10 ++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/RailroadMacro.java b/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/RailroadMacro.java
index 8272a94..4703d54 100644
--- a/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/RailroadMacro.java
+++ b/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/RailroadMacro.java
@@ -65,13 +65,13 @@ public class RailroadMacro
Railroad railroad = getRailroad(fileName);
if (renderLink) {
- sink.link(railroad.getLink("#" + topic));
+ sink.link(Railroad.getLink("#" + topic));
sink.text(topic);
sink.link_();
} else {
if (setAnchor) {
sink.rawText("<h2>");
- sink.anchor(railroad.getLink(topic));
+ sink.anchor(Railroad.getLink(topic));
sink.anchor_();
sink.text(topic);
sink.rawText("</h2>");
diff --git a/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfRailroad.java b/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfRailroad.java
index f44225f..81fb24a 100644
--- a/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfRailroad.java
+++ b/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfRailroad.java
@@ -33,7 +33,7 @@ public class BnfRailroad implements BnfVisitor {
private static final boolean RAILROAD_DOTS = true;
- private static final Map<String, String> XPATH_KEYWORD_TO_ESCAPE = new HashMap();
+ private static final Map<String, String> XPATH_KEYWORD_TO_ESCAPE = new HashMap<>();
static {
XPATH_KEYWORD_TO_ESCAPE.put("|", "@PIPE@");
XPATH_KEYWORD_TO_ESCAPE.put("element", "@ELEMENT@");
@@ -241,4 +241,16 @@ public class BnfRailroad implements BnfVisitor {
html = buff.toString();
}
+ @Override
+ public void visitRuleOptional(ArrayList<Rule> list) {
+ for (Rule r : list) {
+ visitRuleOptional(r);
+ }
+ }
+
+ @Override
+ public void visitRuleExtension(Rule rule, boolean compatibility) {
+ // not used
+ }
+
}
diff --git a/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfSyntax.java b/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfSyntax.java
index 91a32ed..cc527ca 100644
--- a/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfSyntax.java
+++ b/oak-doc-railroad-macro/src/main/java/org/apache/jackrabbit/oak/doc/doxia/jcr/BnfSyntax.java
@@ -114,4 +114,14 @@ public class BnfSyntax implements BnfVisitor {
// not used
}
+ @Override
+ public void visitRuleOptional(ArrayList<Rule> list) {
+ // not used
+ }
+
+ @Override
+ public void visitRuleExtension(Rule rule, boolean compatibility) {
+ // not used
+ }
+
}