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/10/10 13:04:16 UTC
[isis] branch master updated: ISIS-3240: enforce text rendering (backed by label) when panel is textual
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 33de85d7e4 ISIS-3240: enforce text rendering (backed by label) when panel is textual
33de85d7e4 is described below
commit 33de85d7e40a01f120d8de2adf04d47687362bdd
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Oct 10 15:04:10 2022 +0200
ISIS-3240: enforce text rendering (backed by label) when panel is
textual
---
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 5 ++---
.../components/scalars/ScalarPanelTextFieldTextualAbstract.java | 8 ++++++++
.../ui/components/scalars/string/ScalarTitleBadgePanel.java | 3 ++-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 7f3910fe60..4b687df530 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -90,7 +90,7 @@ implements ScalarModelChangeListener {
public enum FormatModifier {
MARKUP,
MULTILINE,
- BADGE,
+ TEXT_ONLY,
}
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index aac3f410dc..0849951c14 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -189,9 +189,8 @@ extends ScalarPanelAbstract {
getPlaceholderRenderService()
.asHtml(PlaceholderLiteral.NULL_REPRESENTATION));
}
- val useText = isUsingTextarea()
- || getFormatModifiers().contains(FormatModifier.BADGE);
- return useText
+ return isUsingTextarea()
+ || getFormatModifiers().contains(FormatModifier.TEXT_ONLY)
? UiString.text(proposedValue.getValueAsTitle().getValue())
: UiString.markup(proposedValue.getValueAsHtml().getValue());
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
index 70273921f8..c530799ae2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars;
+import java.util.EnumSet;
+
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
@@ -41,6 +43,12 @@ extends ScalarPanelTextFieldAbstract<String> {
super(id, scalarModel, String.class);
}
+ @Override
+ protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
+ // enforce use of text representation
+ modifiers.add(FormatModifier.TEXT_ONLY);
+ }
+
@Override
protected final IConverter<String> getConverter(
final @NonNull ObjectFeature propOrParam,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
index 4ff3352242..f6018372cd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/ScalarTitleBadgePanel.java
@@ -42,7 +42,8 @@ public class ScalarTitleBadgePanel<T> extends ScalarPanelTextFieldWithValueSeman
@Override
protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
- modifiers.add(FormatModifier.BADGE);
+ // enforce use of text representation, as the HTML template fragments already have badge specific markup
+ modifiers.add(FormatModifier.TEXT_ONLY);
}
@Override