This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ccfe7f97bef7f14f3c06d1c6ddca1aefb2bf95f3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jul 9 06:58:31 2020 +0100
ISIS-2395: fixes Markup::asString to ::asHtml
---
examples/demo/pom.xml | 1 +
incubator/pom.xml | 2 --
.../viewer/javafx/ui/components/markup/MarkupFieldFactory.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 5baedd0..eb6fefd 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -143,6 +143,7 @@
<modules>
<module>domain</module>
+ <!--<module>javafx</module>-->
<module>wicket</module>
</modules>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index be91ce7..0b02534 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -113,9 +113,7 @@
<modules>
<module>mappings/microprofile</module>
<module>viewers/vaadin</module>
-<!--
<module>viewers/javafx</module>
--->
</modules>
</project>
diff --git a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java
index 05b6a03..27ed473 100644
--- a/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java
+++ b/incubator/viewers/javafx/ui/src/main/java/org/apache/isis/incubator/viewer/javafx/ui/components/markup/MarkupFieldFactory.java
@@ -69,7 +69,7 @@ public class MarkupFieldFactory implements UiComponentHandlerFx {
public FormField handle(Request request) {
val markupHtml = request.getFeatureValue(Markup.class)
- .map(Markup::asString)
+ .map(Markup::asHtml)
.orElse("");