[isis] branch master updated: ISIS-2519: fix wrongly named 'footnote' -> 'callout'

[ah...@apache.org]

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 154cd23  ISIS-2519: fix wrongly named 'footnote' -> 'callout'
154cd23 is described below

commit 154cd239a6fde0e9e06b827a7d073e7d8a325885
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 8 07:52:18 2021 +0100

    ISIS-2519: fix wrongly named 'footnote' -> 'callout'
---
 .../format/UnitFormatterWithSourceAndCallouts.java   |  2 +-
 .../isis/tooling/model4adoc/AsciiDocFactory.java     |  6 +++---
 .../test/ast/{FootnoteTest.java => CalloutTest.java} | 20 ++++++++++----------
 .../test/ast/{footnote.adoc => callout.adoc}         |  0
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java
index f05dbfe..930cc93 100644
--- a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java
+++ b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/format/UnitFormatterWithSourceAndCallouts.java
@@ -81,7 +81,7 @@ extends UnitFormatterAbstract {
 
     }
 
-    //XXX java language syntax (for footnote text), but not used any more
+    //XXX java language syntax (for callout text), but not used any more
 //
 //    @Override
 //    public String getEnumConstantFormat() {
diff --git a/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocFactory.java b/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocFactory.java
index 40f263e..26e9a6d 100644
--- a/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocFactory.java
+++ b/tooling/model4adoc/src/main/java/org/apache/isis/tooling/model4adoc/AsciiDocFactory.java
@@ -149,9 +149,9 @@ public class AsciiDocFactory {
     // -- FOOTNOTES
 
     public static org.asciidoctor.ast.List callouts(StructuralNode parent) {
-        val footnoteList = list(parent);
-        footnoteList.setStyle("arabic");
-        return footnoteList;
+        val calloutList = list(parent);
+        calloutList.setStyle("arabic");
+        return calloutList;
     }
 
     public static ListItem callout(org.asciidoctor.ast.List parent, @NonNull String source) {
diff --git a/tooling/model4adoc/src/test/java/org/apache/isis/tooling/model4adoc/test/ast/FootnoteTest.java b/tooling/model4adoc/src/test/java/org/apache/isis/tooling/model4adoc/test/ast/CalloutTest.java
similarity index 77%
rename from tooling/model4adoc/src/test/java/org/apache/isis/tooling/model4adoc/test/ast/FootnoteTest.java
rename to tooling/model4adoc/src/test/java/org/apache/isis/tooling/model4adoc/test/ast/CalloutTest.java
index fed4696..f4b3369 100644
--- a/tooling/model4adoc/src/test/java/org/apache/isis/tooling/model4adoc/test/ast/FootnoteTest.java
+++ b/tooling/model4adoc/src/test/java/org/apache/isis/tooling/model4adoc/test/ast/CalloutTest.java
@@ -30,14 +30,14 @@ import static org.apache.isis.tooling.model4adoc.AsciiDocFactory.doc;
 
 import lombok.val;
 
-class FootnoteTest extends AbstractAsciiDocWriterTest {
+class CalloutTest extends AbstractAsciiDocWriterTest {
 
     private Document doc;
 
     @BeforeEach
     void setUp() throws Exception {
         doc = doc();
-        super.adocSourceResourceLocation = "footnote.adoc";
+        super.adocSourceResourceLocation = "callout.adoc";
         super.debugEnabled = false;
     }
 
@@ -64,23 +64,23 @@ class FootnoteTest extends AbstractAsciiDocWriterTest {
     @Test
     void testFootnote() throws IOException {
 
-        val footnotes = AsciiDocFactory.callouts(doc);
-        val footnoteLI = AsciiDocFactory.callout(footnotes, "fn-1");
-        val footnote = AsciiDocFactory.openBlock(footnoteLI);
+        val callouts = AsciiDocFactory.callouts(doc);
+        val calloutLI = AsciiDocFactory.callout(callouts, "fn-1");
+        val callout = AsciiDocFactory.openBlock(calloutLI);
 
 
-        val note = AsciiDocFactory.warning(footnote);
+        val note = AsciiDocFactory.warning(callout);
         AsciiDocFactory.block(note, "warn-1");
         AsciiDocFactory.block(note, "warn-2");
 
-        AsciiDocFactory.block(footnote, "para-1");
-        AsciiDocFactory.block(footnote, "para-2");
+        AsciiDocFactory.block(callout, "para-1");
+        AsciiDocFactory.block(callout, "para-2");
 
-        val nestedList = AsciiDocFactory.list(footnote);
+        val nestedList = AsciiDocFactory.list(callout);
         AsciiDocFactory.listItem(nestedList, "li-1");
         AsciiDocFactory.listItem(nestedList, "li-2");
 
-        AsciiDocFactory.block(footnote, "para-3");
+        AsciiDocFactory.block(callout, "para-3");
 
         AsciiDocFactory.tip(doc, "Here's something worth knowing...");
 
diff --git a/tooling/model4adoc/src/test/resources/org/apache/isis/tooling/model4adoc/test/ast/footnote.adoc b/tooling/model4adoc/src/test/resources/org/apache/isis/tooling/model4adoc/test/ast/callout.adoc
similarity index 100%
rename from tooling/model4adoc/src/test/resources/org/apache/isis/tooling/model4adoc/test/ast/footnote.adoc
rename to tooling/model4adoc/src/test/resources/org/apache/isis/tooling/model4adoc/test/ast/callout.adoc