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/05/05 06:26:41 UTC
[isis] branch master updated: ISIS-3038: MarkupComponent to support rendering (none) badge for null
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 e5ff0e4b3e ISIS-3038: MarkupComponent to support rendering (none) badge for null
e5ff0e4b3e is described below
commit e5ff0e4b3eda9d1421a17ed652e90fe4149c3040
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu May 5 08:26:36 2022 +0200
ISIS-3038: MarkupComponent to support rendering (none) badge for null
---
.../components/scalars/markup/MarkupComponent.java | 20 +++++---------------
.../scalars/markup/MarkupPanelFactories.java | 4 ++--
.../scalars/markup/StandaloneMarkupPanel.java | 2 +-
3 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
index c4384267b6..00313855ec 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
@@ -77,22 +77,12 @@ public class MarkupComponent extends WebComponent {
}
if(modelObject instanceof ManagedObject) {
-
val adapter = (ManagedObject) modelObject;
-
- if(adapter.getPojo()==null) {
- return fallback;
- }
-
- val asHtml = lookupObjectFeatureIn(getDefaultModel())
- .map(feature->adapter.htmlString(feature))
- .orElseGet(adapter::titleString);
-
- if(asHtml != null) {
- return asHtml;
- }
-
- return fallback;
+ val feature = lookupObjectFeatureIn(getDefaultModel()).orElse(null);
+ val asHtml = adapter.htmlString(feature);
+ return asHtml != null
+ ? asHtml
+ : fallback;
}
return modelObject.toString();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
index 9b4a183e01..f5c7ab457e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
@@ -104,11 +104,11 @@ public class MarkupPanelFactories {
val valueModel = (ValueModel) model;
val objectAdapter = valueModel.getObject();
- if(objectAdapter==null || objectAdapter.getPojo()==null) {
+ if(objectAdapter==null) {
return ApplicationAdvice.DOES_NOT_APPLY;
}
- return appliesIf( valueType.isAssignableFrom(objectAdapter.getPojo().getClass()) );
+ return appliesIf( valueType.isAssignableFrom(objectAdapter.getSpecification().getCorrespondingClass()) );
}
@Override
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
index 4a25a26406..53e7bdcd8b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/StandaloneMarkupPanel.java
@@ -37,7 +37,7 @@ extends PanelAbstract<ManagedObject, ValueModel> {
super(id, valueModel);
val markupComponent = markupComponentFactory
- .newMarkupComponent(ID_STANDALONE_VALUE, getModel());
+ .newMarkupComponent(ID_STANDALONE_VALUE, valueModel);
add(markupComponent);
}