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 a44d53f24a ISIS-3240: typo and wording
a44d53f24a is described below
commit a44d53f24a60bcbcbf3919d1b251d5d1e96ba3c2
Author: Andi Huber <[email protected]>
AuthorDate: Mon Oct 10 13:40:12 2022 +0200
ISIS-3240: typo and wording
---
.../main/java/org/apache/isis/applib/value/semantics/Renderer.java | 2 +-
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 2 +-
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java | 2 +-
.../wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java | 6 +++---
.../wicket/ui/components/scalars/markup/ScalarMarkupPanel.java | 2 +-
.../wicket/ui/components/scalars/string/MultiLineStringPanel.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/Renderer.java
b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/Renderer.java
index 09a02ea84d..6c474c9d51 100644
---
a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/Renderer.java
+++
b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/Renderer.java
@@ -34,7 +34,7 @@ public interface Renderer<T> {
* The value rendered as HTML.
* <p>
* Default implementation uses the 'escaped' titlePresentation.
- * Override for custom HTML, but be aware of potential XSS attack risks.
+ * Override for custom HTML, but be aware of potential XSS attack vectors.
*/
default String htmlPresentation(final ValueSemanticsProvider.Context
context, final T value) {
return _Strings.htmlEscape(titlePresentation(context, value));
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 3fc9622c79..7f3910fe60 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
@@ -89,7 +89,7 @@ implements ScalarModelChangeListener {
public enum FormatModifier {
MARKUP,
- MULITLINE,
+ MULTILINE,
BADGE,
}
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 744200e322..aac3f410dc 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
@@ -163,7 +163,7 @@ extends ScalarPanelAbstract {
private boolean isUsingTextarea() {
if(getRenderScenario().isCompact()
|| getFormatModifiers().contains(FormatModifier.MARKUP)
- || !getFormatModifiers().contains(FormatModifier.MULITLINE)) {
+ || !getFormatModifiers().contains(FormatModifier.MULTILINE)) {
return false;
}
// only render a text-area if it has content
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 40a0e4e170..6c2017352f 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -85,7 +85,7 @@ extends ScalarPanelFormFieldAbstract<T> {
*/
protected AbstractTextComponent<T> createTextField(final String id) {
val converter = getConverter(scalarModel());
- return getFormatModifiers().contains(FormatModifier.MULITLINE)
+ return getFormatModifiers().contains(FormatModifier.MULTILINE)
? Wkt.textAreaWithConverter(
id, unwrappedModel(), type, converter)
: Wkt.textFieldWithConverter(
@@ -107,14 +107,14 @@ extends ScalarPanelFormFieldAbstract<T> {
@Override
protected Optional<InputFragment> getInputFragmentType() {
- return
Optional.of(getFormatModifiers().contains(FormatModifier.MULITLINE)
+ return
Optional.of(getFormatModifiers().contains(FormatModifier.MULTILINE)
? InputFragment.TEXTAREA
: InputFragment.TEXT);
}
@Override
protected String obtainInlinePromptLinkCssIfAny() {
- return !getFormatModifiers().contains(FormatModifier.MULITLINE)
+ return !getFormatModifiers().contains(FormatModifier.MULTILINE)
? super.obtainInlinePromptLinkCssIfAny()
/* Most other components require 'form-control
form-control-sm' on the owning inline prompt link.
* For TextArea, however, this instead appears on the TextArea
itself.
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
index 04648053c6..2b4ce8e77c 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
@@ -47,7 +47,7 @@ extends ScalarPanelTextFieldWithValueSemantics<T> {
@Override
protected void setupFormatModifiers(final EnumSet<FormatModifier>
modifiers) {
modifiers.add(FormatModifier.MARKUP);
- modifiers.add(FormatModifier.MULITLINE);
+ modifiers.add(FormatModifier.MULTILINE);
}
@Override
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
index 08c55c4e8f..0929542051 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
@@ -37,7 +37,7 @@ extends ScalarPanelTextFieldTextualAbstract {
@Override
protected void setupFormatModifiers(final EnumSet<FormatModifier>
modifiers) {
- modifiers.add(FormatModifier.MULITLINE);
+ modifiers.add(FormatModifier.MULTILINE);
}
}
