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 f834b9e7c0 ISIS-3077: remove superfluous escaped boolean in GenericPropertyColumn f834b9e7c0 is described below commit f834b9e7c0769ff97e5e10fa59c81954fde6fb7b Author: Andi Huber <ahu...@apache.org> AuthorDate: Wed Jun 15 17:57:03 2022 +0200 ISIS-3077: remove superfluous escaped boolean in GenericPropertyColumn --- .../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 3 --- .../collectioncontents/ajaxtable/columns/GenericPropertyColumn.java | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java index 6e7525cea9..ad8984d4c5 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java @@ -156,8 +156,6 @@ implements CollectionCountProvider { val collectionModel = getModel(); - final boolean escaped = true; - final String parentTypeName = property.getDeclaringType().getLogicalTypeName(); val commonContext = super.getCommonContext(); @@ -168,7 +166,6 @@ implements CollectionCountProvider { Model.of(property.getCanonicalFriendlyName()), property.getId(), property.getId(), - escaped, parentTypeName, property.getCanonicalDescription()); } diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java index 50c836fb51..21aebd7f57 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java +++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/GenericPropertyColumn.java @@ -58,7 +58,6 @@ extends GenericColumnAbstract { private final EntityCollectionModel.Variant collectionVariant; private final String propertyId; - private final boolean escaped; private final String parentTypeName; private final String describedAs; @@ -68,23 +67,20 @@ extends GenericColumnAbstract { final IModel<String> columnNameModel, final String sortProperty, final String propertyId, - final boolean escaped, final String parentTypeName, final Optional<String> describedAs) { super(commonContext, columnNameModel, sortProperty); this.collectionVariant = collectionVariant; this.propertyId = propertyId; - this.escaped = escaped; this.parentTypeName = parentTypeName; this.describedAs = describedAs.orElse(null); - } @Override public Component getHeader(final String componentId) { final Label label = new Label(componentId, getDisplayModel()); - label.setEscapeModelStrings(escaped); + label.setEscapeModelStrings(true); // the default anyway if(describedAs!=null) { WktTooltips.addTooltip(label, describedAs); }