You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/06/21 07:45:48 UTC
[causeway] branch master updated: CAUSEWAY-3415: wkt vwr: cleaning up dynamic visibility code
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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new d8e63e31c5 CAUSEWAY-3415: wkt vwr: cleaning up dynamic visibility code
d8e63e31c5 is described below
commit d8e63e31c5ab920ccc9ac483c1d942146acc50df
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jun 21 09:45:43 2023 +0200
CAUSEWAY-3415: wkt vwr: cleaning up dynamic visibility code
---
.../entity/collection/EntityCollectionPanel.java | 76 +++++++++++-----------
.../components/entity/fieldset/PropertyGroup.java | 71 +++++++++++---------
.../wicket/ui/components/layout/bs/col/Col.java | 34 +++++-----
...RepeatingViewWithDynamicallyVisibleContent.java | 22 ++++---
.../wicket/ui/components/layout/bs/row/Row.java | 25 ++++---
.../components/layout/bs/tabs/TabGroupPanel.java | 22 ++++---
.../ui/components/layout/bs/tabs/TabPanel.java | 20 ++++--
.../ui/panels/HasDynamicallyVisibleContent.java | 11 ++--
8 files changed, 159 insertions(+), 122 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
index 366509475b..6f83f196bd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
@@ -42,7 +42,6 @@ import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.
import org.apache.causeway.viewer.wicket.ui.components.collection.CollectionPanel;
import org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorHelper;
import org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorPanel;
-import org.apache.causeway.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
@@ -57,8 +56,7 @@ import lombok.val;
* the provided {@link UiObjectWkt}.
*/
public class EntityCollectionPanel
-extends PanelAbstract<ManagedObject, UiObjectWkt>
-implements HasDynamicallyVisibleContent {
+extends PanelAbstract<ManagedObject, UiObjectWkt> {
private static final long serialVersionUID = 1L;
@@ -71,9 +69,6 @@ implements HasDynamicallyVisibleContent {
private final ComponentHintKey selectedItemHintKey;
- @Getter(onMethod_= {@Override})
- private boolean visible = false;
-
@Getter(value = AccessLevel.PROTECTED)
private CollectionPresentationSelectorPanel selectorDropdownPanel;
@@ -90,6 +85,8 @@ implements HasDynamicallyVisibleContent {
this::getSelectorDropdownPanel,
EntityCollectionModelParented.HINT_KEY_SELECTED_ITEM);
+ setVisibilityAllowed(assessVisibility());
+
buildGui();
}
@@ -101,42 +98,67 @@ implements HasDynamicallyVisibleContent {
super.onInitialize();
final WebMarkupContainer panel = this;
- if(visible) {
+ if(isVisibilityAllowed()) {
panel.add(div);
this.setOutputMarkupId(true);
} else {
WktComponents.permanentlyHide(panel, div.getId());
}
-
}
@Override
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
+
tableDecorator().ifPresent(tableDecorator->
renderHeadForTableDecorator(response, tableDecorator));
}
// -- HELPER
- private void buildGui() {
- val collectionModel = entityCollectionModelParented();
- div.setMarkupId("collection-" + collectionModel.getLayoutData().getId());
+ // EntityCollectionModelParented caching
+ private transient EntityCollectionModelParented entityCollectionModelParented;
+ private EntityCollectionModelParented entityCollectionModelParented() {
+ if(entityCollectionModelParented == null) {
+ this.entityCollectionModelParented = EntityCollectionModelParented.forParentObjectModel(getModel(), layoutData);
+ }
+ return entityCollectionModelParented;
+ }
- val collectionMetaModel = collectionModel.getMetaModel();
+ // TableDecorator caching
+ private transient Optional<TableDecorator> tableDecorator;
+ private Optional<TableDecorator> tableDecorator() {
+ if(tableDecorator == null) {
+ this.tableDecorator = entityCollectionModelParented()
+ .getMetaModel()
+ .getTableDecorator();
+ }
+ return tableDecorator;
+ }
- Wkt.cssAppend(div, collectionModel.getIdentifier());
- Wkt.cssAppend(div, collectionModel.getElementType().getFeatureIdentifier());
+ private boolean assessVisibility() {
+ val collectionModel = entityCollectionModelParented();
+ val collectionMetaModel = collectionModel.getMetaModel();
val objectAdapter = getModel().getObject();
final Consent visibility = collectionMetaModel
.isVisible(objectAdapter, InteractionInitiatedBy.USER, Where.OBJECT_FORMS);
- if(visibility.isAllowed()) {
+ return visibility.isAllowed();
+ }
+
+ private void buildGui() {
+ val collectionModel = entityCollectionModelParented();
+ div.setMarkupId("collection-" + collectionModel.getLayoutData().getId());
+
+ Wkt.cssAppend(div, collectionModel.getIdentifier());
+ Wkt.cssAppend(div, collectionModel.getElementType().getFeatureIdentifier());
- visible = true;
+ if(isVisibilityAllowed()) {
- Facets.cssClass(collectionMetaModel, objectAdapter)
+ val collectionMetaModel = collectionModel.getMetaModel();
+
+ Facets.cssClass(collectionMetaModel, getModel().getObject())
.ifPresent(cssClass->Wkt.cssAppend(div, cssClass));
tableDecorator().ifPresent(tableDecorator->
@@ -163,26 +185,6 @@ implements HasDynamicallyVisibleContent {
}
}
- // EntityCollectionModelParented caching
- private transient EntityCollectionModelParented entityCollectionModelParented;
- private EntityCollectionModelParented entityCollectionModelParented() {
- if(entityCollectionModelParented == null) {
- this.entityCollectionModelParented = EntityCollectionModelParented.forParentObjectModel(getModel(), layoutData);
- }
- return entityCollectionModelParented;
- }
-
- // TableDecorator caching
- private transient Optional<TableDecorator> tableDecorator;
- private Optional<TableDecorator> tableDecorator() {
- if(tableDecorator == null) {
- this.tableDecorator = entityCollectionModelParented()
- .getMetaModel()
- .getTableDecorator();
- }
- return tableDecorator;
- }
-
private void createSelectorDropdownPanel(final EntityCollectionModel collectionModel) {
final CollectionPresentationSelectorHelper selectorHelper =
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index 58d7eef8cd..610753d9f7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -52,7 +52,8 @@ import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import lombok.val;
-public class PropertyGroup extends PanelAbstract<ManagedObject, UiObjectWkt> implements HasDynamicallyVisibleContent {
+public class PropertyGroup extends PanelAbstract<ManagedObject, UiObjectWkt>
+implements HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
private static final String ID_MEMBER_GROUP = "memberGroup";
@@ -87,6 +88,44 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, UiObjectWkt> imp
return (UiObjectWkt) getDefaultModel();
}
+ @Override
+ public void onConfigure() {
+ for (final ScalarPanelAbstract childComponent : childScalarPanels) {
+ childComponent.configure();
+ }
+ super.onConfigure();
+ }
+
+ @Override
+ public boolean isVisible() {
+ return super.isVisible()
+ && isVisibleBasedOnContent();
+ }
+
+ @Override
+ public boolean isVisibleBasedOnContent() {
+
+ // HACK: there are some components that are not ScalarPanelAbstract2's, eg the pdfjsviewer.
+ // In this case, don't ever hide.
+
+ // TODO: should remove this hack. We need some sort of SPI for ScalarPanelAbstract2's and any other component,
+ // (eg PdfJsViewer) that can implement. It's "probably" just a matter of having PdfJsViewer do its work in the
+ // correct Wicket callback (probably onConfigure).
+ if(childComponents.size() > childScalarPanels.size()) {
+ return true;
+ }
+ // HACK:END
+
+ for (final ScalarPanelAbstract childComponent : childScalarPanels) {
+ if(childComponent.isVisibilityAllowed()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ // -- HELPER
+
private List<Component> buildGui() {
final List<Component> childComponents = _Lists.newArrayList();
@@ -205,34 +244,4 @@ public class PropertyGroup extends PanelAbstract<ManagedObject, UiObjectWkt> imp
return scalarNameAndValueComponent;
}
- @Override
- public void onConfigure() {
- for (final ScalarPanelAbstract childComponent : childScalarPanels) {
- childComponent.configure();
- }
- super.onConfigure();
- }
-
- @Override
- public boolean isVisible() {
-
- // HACK: there are some components that are not ScalarPanelAbstract2's, eg the pdfjsviewer.
- // In this case, don't ever hide.
-
- // TODO: should remove this hack. We need some sort of SPI for ScalarPanelAbstract2's and any other component,
- // (eg PdfJsViewer) that can implement. It's "probably" just a matter of having PdfJsViewer do its work in the
- // correct Wicket callback (probably onConfigure).
- if(childComponents.size() > childScalarPanels.size()) {
- return true;
- }
- // HACK:END
-
- for (final ScalarPanelAbstract childComponent : childScalarPanels) {
- if(childComponent.isVisibilityAllowed()) {
- return true;
- }
- }
- return false;
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java
index 5cd98364d0..4335d78fb4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/Col.java
@@ -52,6 +52,7 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
+import lombok.Getter;
import lombok.val;
public class Col
@@ -69,6 +70,9 @@ implements HasDynamicallyVisibleContent {
private final BSCol bsCol;
+ @Getter(onMethod_= {@Override})
+ private boolean visibleBasedOnContent = false;
+
public Col(
final String id,
final UiObjectWkt entityModel, final BSCol bsCol) {
@@ -80,6 +84,14 @@ implements HasDynamicallyVisibleContent {
buildGui();
}
+ @Override
+ public boolean isVisible() {
+ return super.isVisible()
+ && isVisibleBasedOnContent();
+ }
+
+ // -- HELPER
+
private void buildGui() {
setRenderBodyOnly(true);
@@ -111,7 +123,7 @@ implements HasDynamicallyVisibleContent {
actionIdToUse = "entityActions";
actionIdToHide = "actions";
- visible = true;
+ visibleBasedOnContent = true;
} else {
WktComponents.permanentlyHide(div, ID_ENTITY_HEADER_PANEL);
actionOwner = div;
@@ -136,7 +148,7 @@ implements HasDynamicallyVisibleContent {
if (!visibleActions.isEmpty()) {
AdditionalLinksPanel.addAdditionalLinks(actionOwner, actionIdToUse, visibleActions, AdditionalLinksPanel.Style.INLINE_LIST);
- visible = true;
+ visibleBasedOnContent = true;
} else {
WktComponents.permanentlyHide(actionOwner, actionIdToUse);
}
@@ -150,7 +162,7 @@ implements HasDynamicallyVisibleContent {
if(!rows.isEmpty()) {
final RepeatingViewWithDynamicallyVisibleContent rowsRv = buildRows(ID_ROWS, rows);
div.add(rowsRv);
- visible = visible || rowsRv.isVisible();
+ visibleBasedOnContent = visibleBasedOnContent || rowsRv.isVisible();
} else {
WktComponents.permanentlyHide(div, ID_ROWS);
}
@@ -200,7 +212,7 @@ implements HasDynamicallyVisibleContent {
}
div.add(tabGroupRv);
- visible = visible || tabGroupRv.isVisible();
+ visibleBasedOnContent = visibleBasedOnContent || tabGroupRv.isVisible();
} else {
WktComponents.permanentlyHide(div, ID_TAB_GROUPS);
}
@@ -226,7 +238,7 @@ implements HasDynamicallyVisibleContent {
fieldSetRv.add(propertyGroup);
}
div.add(fieldSetRv);
- visible = visible || fieldSetRv.isVisible();
+ visibleBasedOnContent = visibleBasedOnContent || fieldSetRv.isVisible();
} else {
WktComponents.permanentlyHide(div, ID_FIELD_SETS);
}
@@ -259,7 +271,7 @@ implements HasDynamicallyVisibleContent {
});
div.add(collectionRv);
- visible = visible || collectionRv.isVisible();
+ visibleBasedOnContent = visibleBasedOnContent || collectionRv.isVisible();
} else {
WktComponents.permanentlyHide(div, ID_COLLECTIONS);
@@ -267,7 +279,7 @@ implements HasDynamicallyVisibleContent {
final WebMarkupContainer panel = this;
- if(visible) {
+ if(visibleBasedOnContent) {
panel.add(div);
} else {
WktComponents.permanentlyHide(panel, div.getId());
@@ -287,12 +299,4 @@ implements HasDynamicallyVisibleContent {
return rowRv;
}
-
- private boolean visible = false;
- @Override
- public boolean isVisible() {
- return visible;
- }
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
index 149df9babf..5291c507b6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/col/RepeatingViewWithDynamicallyVisibleContent.java
@@ -24,35 +24,39 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.causeway.viewer.wicket.ui.panels.HasDynamicallyVisibleContent;
+import lombok.Getter;
+
public class RepeatingViewWithDynamicallyVisibleContent
extends RepeatingView
implements HasDynamicallyVisibleContent {
private static final long serialVersionUID = 1L;
+ @Getter(onMethod_= {@Override})
+ private boolean visibleBasedOnContent = false;
+
public RepeatingViewWithDynamicallyVisibleContent(final String id) {
super(id);
}
+ @Override
+ public boolean isVisible() {
+ return super.isVisible()
+ && isVisibleBasedOnContent();
+ }
+
@Override
public MarkupContainer add(final Component... children) {
final MarkupContainer component = super.add(children);
for (Component child : children) {
if(child instanceof HasDynamicallyVisibleContent) {
final HasDynamicallyVisibleContent hasDynamicallyVisibleContent = (HasDynamicallyVisibleContent) child;
- visible = visible || hasDynamicallyVisibleContent.isVisible();
+ visibleBasedOnContent = visibleBasedOnContent || hasDynamicallyVisibleContent.isVisibleBasedOnContent();
} else {
- visible = true;
+ visibleBasedOnContent = true;
}
}
return component;
}
- private boolean visible = false;
-
- @Override
- public boolean isVisible() {
- return visible;
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/row/Row.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/row/Row.java
index 21b6dfa321..953962ec5d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/row/Row.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/row/Row.java
@@ -34,6 +34,8 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
+import lombok.Getter;
+
public class Row
extends PanelAbstract<ManagedObject, UiObjectWkt>
implements HasDynamicallyVisibleContent {
@@ -44,6 +46,9 @@ implements HasDynamicallyVisibleContent {
private final BSRow bsRow;
+ @Getter(onMethod_= {@Override})
+ private boolean visibleBasedOnContent = false;
+
public Row(
final String id,
final UiObjectWkt entityModel,
@@ -56,6 +61,14 @@ implements HasDynamicallyVisibleContent {
buildGui();
}
+ @Override
+ public boolean isVisible() {
+ return super.isVisible()
+ && isVisibleBasedOnContent();
+ }
+
+ // -- HELPER
+
private void buildGui() {
final RepeatingViewWithDynamicallyVisibleContent rv =
@@ -71,7 +84,7 @@ implements HasDynamicallyVisibleContent {
final BSCol bsCol = (BSCol) bsRowContent;
final Col col = new Col(id, getModel(), bsCol);
- visible = visible || col.isVisible();
+ visibleBasedOnContent = visibleBasedOnContent || col.isVisible();
rowContent = col;
} else if (bsRowContent instanceof BSClearFix) {
@@ -85,7 +98,7 @@ implements HasDynamicallyVisibleContent {
}
final WebMarkupContainer panel = this;
- if(visible) {
+ if(visibleBasedOnContent) {
Wkt.cssAppend(panel, "row");
Wkt.cssAppend(panel, bsRow.getCssClass());
panel.add(rv);
@@ -95,12 +108,4 @@ implements HasDynamicallyVisibleContent {
}
-
- private boolean visible = false;
- @Override
- public boolean isVisible() {
- return visible;
- }
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
index c287a12676..1d20e3b248 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabGroupPanel.java
@@ -91,12 +91,26 @@ implements HasDynamicallyVisibleContent {
super.onInitialize();
}
+ @Override
+ public boolean isVisible() {
+ return super.isVisible()
+ && isVisibleBasedOnContent();
+ }
+
+ @Override
+ public boolean isVisibleBasedOnContent() {
+ return _NullSafe.stream(getTabs())
+ .anyMatch(ITab::isVisible);
+ }
+
@Override
public TabbedPanel<ITab> setSelectedTab(final int index) {
selectedTabHintKey.set(entityModel.getOwnerBookmark(), ""+index);
return super.setSelectedTab(index);
}
+ // -- HELPER
+
private void setSelectedTabFromSessionIfAny(
final AjaxBootstrapTabbedPanel<ITab> ajaxBootstrapTabbedPanel) {
final String selectedTabStr = selectedTabHintKey.get(entityModel.getOwnerBookmark());
@@ -117,12 +131,4 @@ implements HasDynamicallyVisibleContent {
return null;
}
}
-
- @Override
- public boolean isVisible() {
- return _NullSafe.stream(getTabs())
- .anyMatch(ITab::isVisible);
- }
-
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
index 72f6a659a7..0fb8fb51b6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/layout/bs/tabs/TabPanel.java
@@ -32,6 +32,8 @@ import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
+import lombok.Getter;
+
public class TabPanel
extends PanelAbstract<ManagedObject, UiObjectWkt>
implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
@@ -43,6 +45,9 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
private final BSTab bsTab;
+ @Getter(onMethod_= {@Override})
+ private boolean visibleBasedOnContent = false;
+
public TabPanel(final String id, final UiObjectWkt model, final BSTab bsTab) {
this(id, model, bsTab, null);
}
@@ -54,6 +59,12 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
buildGui(model, bsTab, repeatingViewWithDynamicallyVisibleContent);
}
+ @Override
+ public boolean isVisible() {
+ return super.isVisible()
+ && isVisibleBasedOnContent();
+ }
+
/**
* when tabs are rendered, they don't distinguish within the path hierarchy: even if on different tabs, the first
* panel will have the same Wicket path hierarchy. This property allows us to distinguish.
@@ -69,10 +80,10 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
final RepeatingViewWithDynamicallyVisibleContent rv = rvIfAny != null ? rvIfAny : newRows(model, bsTab);
div.add(rv);
- visible = visible || rv.isVisible();
+ visibleBasedOnContent = visibleBasedOnContent || rv.isVisible();
final WebMarkupContainer panel = this;
- if(visible) {
+ if(visibleBasedOnContent) {
Wkt.cssAppend(panel, bsTab.getCssClass());
panel.add(div);
} else {
@@ -92,9 +103,4 @@ implements HasUiHintDisambiguator, HasDynamicallyVisibleContent {
return rv;
}
- private boolean visible = false;
- @Override
- public boolean isVisible() {
- return visible;
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
index 80b3f03e05..b51941d076 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/HasDynamicallyVisibleContent.java
@@ -22,14 +22,15 @@ import org.apache.causeway.viewer.wicket.ui.components.layout.bs.col.Col;
/**
* Implemented by all Wicket UI components that contain other content which may or
- * may not be visible, eg per user, or per imperative hideXxx() method.
- *
+ * may not be visible, eg per user or per imperative hideXxx() method.
* <p>
- * The {@link Col}, {@link org.apache.causeway.viewer.wicket.ui.components.layout.bs.row.Row} etc components that implement this interface cascade their visibility up to their parent component; so for example if a tabpanel contains a tab that contains a single fieldset that contains a single property, and that property is invisible, then the entire tab is invisible.
- * </p>
+ * The {@link Col}, {@link org.apache.causeway.viewer.wicket.ui.components.layout.bs.row.Row} etc
+ * components that implement this interface cascade their visibility up to their parent component;
+ * so for example if a tabpanel contains a tab that contains a single fieldset that contains a single property,
+ * and that property is invisible, then the entire tab is invisible.
*/
public interface HasDynamicallyVisibleContent {
- boolean isVisible();
+ boolean isVisibleBasedOnContent();
}