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/04/17 08:37:45 UTC
[isis] branch master updated: ISIS-3006: metamodel: multiline nr of line fix
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 b419fb86b3 ISIS-3006: metamodel: multiline nr of line fix
b419fb86b3 is described below
commit b419fb86b37bdc562895bf2a1e250287214ad914
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Apr 17 10:37:38 2022 +0200
ISIS-3006: metamodel: multiline nr of line fix
---
.../java/org/apache/isis/core/metamodel/util/Facets.java | 4 ++--
.../apache/isis/viewer/wicket/model/models/ScalarModel.java | 2 +-
.../main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java
index d1befad8df..cdb051aae3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/Facets.java
@@ -277,8 +277,8 @@ public final class Facets {
.isPresent();
}
- public OptionalInt multilineNumberOfLines(final ObjectSpecification objectSpec) {
- return objectSpec
+ public OptionalInt multilineNumberOfLines(final ObjectFeature feature) {
+ return feature
.lookupFacet(MultiLineFacet.class)
.map(MultiLineFacet::numberOfLines)
.map(OptionalInt::of)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 79b0c012a4..5890d20c93 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -346,7 +346,7 @@ implements HasRenderingHints, ScalarUiModel, LinksProvider, FormExecutorContext
}
public final OptionalInt multilineNumberOfLines() {
- return Facets.multilineNumberOfLines(getScalarTypeSpec());
+ return Facets.multilineNumberOfLines(getMetaModel());
}
public final OptionalInt maxLength() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
index 6d201169c8..3c87e544b1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
@@ -881,16 +881,16 @@ public class Wkt {
if(formComponent instanceof TextArea) {
multilineNumberOfLines.get()
- .ifPresent(numberOfLines->
- Wkt.attributeReplace(formComponent, "rows", numberOfLines));
-
- // in conjunction with javascript in jquery.isis.wicket.viewer.js
- // see http://stackoverflow.com/questions/4459610/set-maxlength-in-html-textarea
- //Wkt.attributeReplace(textArea, "maxlength", getMaxLengthOf(scalarModel));
+ .ifPresent(numberOfLines->{
+ System.err.printf("%d%n", numberOfLines);
+ Wkt.attributeReplace(formComponent, "rows", numberOfLines);});
}
maxLength.get()
.ifPresent(maxLen->{
+ // for TextArea in conjunction with javascript in jquery.isis.wicket.viewer.js
+ // see http://stackoverflow.com/questions/4459610/set-maxlength-in-html-textarea
+
Wkt.attributeReplace(formComponent, "maxlength", maxLen);
if(formComponent.getType().equals(String.class)) {
formComponent.add(StringValidator.maximumLength(maxLen));