You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/09/29 16:19:39 UTC
[isis] branch master updated: ISIS-3122: demo: restore markdown samples that got lost earlier today
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 bd1fa7ce89 ISIS-3122: demo: restore markdown samples that got lost earlier today
bd1fa7ce89 is described below
commit bd1fa7ce891ae00411cf6d2eca5e1861cc5fd9fb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 29 18:19:34 2022 +0200
ISIS-3122: demo: restore markdown samples that got lost earlier today
---
.../samples/markdown/IsisMarkdownSamples-sample1.md | 21 +++++++++++++++++++++
.../samples/markdown/IsisMarkdownSamples-sample2.md | 11 +++++++++++
.../samples/markdown/IsisMarkdownSamples-sample3.md | 11 +++++++++++
.../samples/markdown/IsisMarkdownSamples-sample4.md | 6 ++++++
.../samples/markdown/IsisMarkdownSamples-sample5.md | 6 ++++++
.../samples/markdown/IsisMarkdownSamples-sample6.md | 16 ++++++++++++++++
.../samples/markdown}/IsisMarkdownSamples.java | 21 ++++++++++++++-------
.../metaprog/demoshowcases/value/ValueShowCase.java | 3 ++-
8 files changed, 87 insertions(+), 8 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample1.md b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample1.md
new file mode 100644
index 0000000000..ff342ff0ea
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample1.md
@@ -0,0 +1,21 @@
+## Lists
+
+Unordered
+
+* this
+* is
+* a
+* bulleted
+* list
+
+
+Ordered
+
+1. Lorem ipsum dolor sit amet
+2. Consectetur adipiscing elit
+3. Integer molestie lorem at massa
+
+
+1. You can use sequential numbers...
+1. ...or keep all the numbers as `1.`
+
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample2.md b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample2.md
new file mode 100644
index 0000000000..14e2cf5067
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample2.md
@@ -0,0 +1,11 @@
+## Typographic replacements
+
+Enable typographer option to see result.
+
+(c) (C) (r) (R) (tm) (TM) (p) (P) +-
+
+test.. test... test..... test?..... test!....
+
+!!!!!! ???? ,, -- ---
+
+"Smartypants, double quotes" and 'single quotes'
\ No newline at end of file
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample3.md b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample3.md
new file mode 100644
index 0000000000..c0ab48a094
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample3.md
@@ -0,0 +1,11 @@
+## Emphasis
+
+**This is bold text**
+
+__This is bold text__
+
+*This is italic text*
+
+_This is italic text_
+
+~~Strikethrough~~
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample4.md b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample4.md
new file mode 100644
index 0000000000..373f070dac
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample4.md
@@ -0,0 +1,6 @@
+## Blockquotes
+
+
+> Blockquotes can also be nested...
+>> ...by using additional greater-than signs right next to each other...
+> > > ...or with spaces between arrows.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample5.md b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample5.md
new file mode 100644
index 0000000000..373f070dac
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample5.md
@@ -0,0 +1,6 @@
+## Blockquotes
+
+
+> Blockquotes can also be nested...
+>> ...by using additional greater-than signs right next to each other...
+> > > ...or with spaces between arrows.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample6.md b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample6.md
new file mode 100644
index 0000000000..aaed9d1815
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples-sample6.md
@@ -0,0 +1,16 @@
+## Tables
+
+| Option | Description |
+| ------ | ----------- |
+| data | path to data files to supply the data that will be passed into templates. |
+| engine | engine to be used for processing templates. Handlebars is the default. |
+| ext | extension to be used for dest files. |
+
+
+Right aligned columns
+
+| Option | Description |
+| ------:| -----------:|
+| data | path to data files to supply the data that will be passed into templates. |
+| engine | engine to be used for processing templates. Handlebars is the default. |
+| ext | extension to be used for dest files. |
\ No newline at end of file
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/samples/IsisMarkdownSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples.java
similarity index 64%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/samples/IsisMarkdownSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples.java
index 1326998c4e..cb8758cae0 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/samples/IsisMarkdownSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/markdown/IsisMarkdownSamples.java
@@ -16,23 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisval.markdowns.samples;
+package demoapp.dom._infra.samples.markdown;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
+import javax.inject.Inject;
+
import org.springframework.stereotype.Service;
+import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
+
+import demoapp.dom._infra.resources.MarkdownReaderService;
import demoapp.dom.types.Samples;
-/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Service
-public class IsisMarkdownSamples implements Samples<org.apache.isis.valuetypes.markdown.applib.value.Markdown> {
+public class IsisMarkdownSamples implements Samples<Markdown> {
@Override
- public Stream<org.apache.isis.valuetypes.markdown.applib.value.Markdown> stream() {
- return new org.apache.isis.valuetypes.markdown.metamodel.semantics.MarkdownValueSemantics()
- .getExamples()
- .stream();
+ public Stream<Markdown> stream() {
+ return IntStream.rangeClosed(1, 6)
+ .mapToObj(x -> markdownReaderService.readFor(getClass(), "sample" + x));
}
+ @Inject
+ MarkdownReaderService markdownReaderService;
+
}
diff --git a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
index 0fb9eea88c..5137d3386d 100644
--- a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
+++ b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
@@ -39,7 +39,8 @@ public enum ValueShowCase {
.showcaseName("IsisMarkdown")
.javaPackage("demoapp.dom.types.isisval.markdowns")
.showcaseValueType("org.apache.isis.valuetypes.markdown.applib.value.Markdown")
- .showcaseValueSemantics("org.apache.isis.valuetypes.markdown.metamodel.semantics.MarkdownValueSemantics")),
+ .showcaseValueSemantics("org.apache.isis.valuetypes.markdown.metamodel.semantics.MarkdownValueSemantics")
+ .templates(Template.REGULAR_SET_NO_SAMPLES)), // demo provides its own MarkdownSamples
ASCIIDOC(Config.builder()
.showcaseName("IsisAsciiDoc")
.javaPackage("demoapp.dom.types.isisval.asciidocs")