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 cc94a9965a ISIS-3240: remove FormatModifier NO_OUTPUT_ESCAPE
cc94a9965a is described below
commit cc94a9965a82ba8faac1b151777c44061b178673
Author: Andi Huber <[email protected]>
AuthorDate: Mon Oct 10 09:47:42 2022 +0200
ISIS-3240: remove FormatModifier NO_OUTPUT_ESCAPE
- we now have dynamic assessment with UiString to be used instead
---
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 2 --
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 4 +---
.../components/scalars/ScalarPanelTextFieldWithValueSemantics.java | 7 -------
3 files changed, 1 insertion(+), 12 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 c9769fa8e2..3fc9622c79 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
@@ -91,8 +91,6 @@ implements ScalarModelChangeListener {
MARKUP,
MULITLINE,
BADGE,
- /** render output un-escaped; careful not to allow XSS
vulnerabilities*/
- NO_OUTPUT_ESCAPE
}
/**
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 b940ed1499..744200e322 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
@@ -141,9 +141,7 @@ extends ScalarPanelAbstract {
}
return CompactFragment.LABEL
.createFragment(id, this, scalarValueId->
-
getFormatModifiers().contains(FormatModifier.NO_OUTPUT_ESCAPE)
- ? markupComponent(scalarValueId,
this::outputFormatAsString)
- : Wkt.labelWithDynamicEscaping(scalarValueId,
this::obtainOutputFormat));
+ Wkt.labelWithDynamicEscaping(scalarValueId,
this::obtainOutputFormat));
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java
index dfcc425ebf..6946b7ae9d 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars;
-import java.util.EnumSet;
-
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.applib.value.semantics.ValueSemanticsProvider;
@@ -54,9 +52,4 @@ extends ScalarPanelTextFieldAbstract<T> {
return new ConverterBasedOnValueSemantics<>(propOrParam,
scalarRepresentation);
}
- @Override
- protected void setupFormatModifiers(final EnumSet<FormatModifier>
modifiers) {
- modifiers.add(FormatModifier.NO_OUTPUT_ESCAPE);
- }
-
}
