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 2023/01/20 07:43:05 UTC
[isis] branch master updated: ISIS-3332: fixes Collection View throws when less than 2 Collection Presentations available
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 25c35caaaf ISIS-3332: fixes Collection View throws when less than 2 Collection Presentations available
25c35caaaf is described below
commit 25c35caaafee77ea6e2c6fdf3eb7f290a747554d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 20 08:42:59 2023 +0100
ISIS-3332: fixes Collection View throws when less than 2 Collection
Presentations available
---
.../components/bookmarkedpages/BookmarkedPagesPanel.java | 3 ++-
.../selector/CollectionPresentationSelectorPanel.java | 3 ++-
.../multiple/CollectionContentsMultipleViewsPanel.java | 3 ++-
.../entity/collection/EntityCollectionPanel.java | 2 +-
.../ui/components/entity/header/EntityHeaderPanel.java | 3 ++-
.../ui/components/scalars/image/JavaAwtImagePanel.java | 3 ++-
.../causeway/viewer/wicket/ui/panels/PanelAbstract.java | 15 ---------------
7 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index 0e5f6bcbdf..3ebd0c0e99 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -42,6 +42,7 @@ import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
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 org.apache.causeway.viewer.wicket.ui.util.WktLinks;
import lombok.val;
@@ -117,7 +118,7 @@ extends PanelAbstract<List<BookmarkTreeNode>, BookmarkedPagesModel> {
val clearBookmarkLink = Wkt.linkAdd(item, ID_CLEAR_BOOKMARK_LINK, target->{
bookmarkedPagesModel.remove(bookmarkNode);
if(bookmarkedPagesModel.isEmpty()) {
- permanentlyHide(CLEAR_BOOKMARKS);
+ WktComponents.permanentlyHide(this, CLEAR_BOOKMARKS);
}
target.add(container, clearAllBookmarksLink);
});
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
index aad10d784e..457c0de0cd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java
@@ -38,6 +38,7 @@ import org.apache.causeway.viewer.wicket.ui.CollectionContentsAsFactory;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
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 org.apache.causeway.viewer.wicket.ui.util.WktLinks;
import lombok.val;
@@ -99,7 +100,7 @@ extends PanelAbstract<DataTableModel, EntityCollectionModel> {
// selector
if (componentFactories.size() <= 1) {
- permanentlyHide(ID_VIEWS);
+ WktComponents.permanentlyHide(this, ID_VIEWS);
return;
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
index 0edf1683ed..b6dc25a16b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/multiple/CollectionContentsMultipleViewsPanel.java
@@ -39,6 +39,7 @@ import org.apache.causeway.viewer.wicket.ui.components.collection.selector.Colle
import org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorPanel;
import org.apache.causeway.viewer.wicket.ui.components.collection.selector.CollectionPresentationSelectorProvider;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
/**
* Subscribes to events generated by
@@ -123,7 +124,7 @@ implements CollectionCountProvider {
// hide any unused placeholders
while(i<MAX_NUM_UNDERLYING_VIEWS) {
String underlyingId = underlyingIdPrefix + "-" + i;
- permanentlyHide(underlyingId);
+ WktComponents.permanentlyHide(this, underlyingId);
i++;
}
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 ee2ab9b13c..e4743f74f8 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
@@ -184,7 +184,7 @@ implements HasDynamicallyVisibleContent {
final List<ComponentFactory> componentFactories = selectorHelper.getComponentFactories();
if (componentFactories.size() <= 1) {
- permanentlyHide(ID_SELECTOR_DROPDOWN);
+ WktComponents.permanentlyHide(div, ID_SELECTOR_DROPDOWN);
} else {
selectorDropdownPanel = new CollectionPresentationSelectorPanel(ID_SELECTOR_DROPDOWN,
collectionModel, selectedItemHintKey);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index b57f859aba..5b8a0d2cc4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -29,6 +29,7 @@ import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.AdditionalLinksPanel;
import org.apache.causeway.viewer.wicket.ui.components.actionmenu.entityactions.LinkAndLabelFactory;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
import lombok.val;
@@ -82,7 +83,7 @@ extends PanelAbstract<ManagedObject, UiObjectWkt> {
.addAdditionalLinks(this, ID_ENTITY_ACTIONS, topLevelActions,
AdditionalLinksPanel.Style.INLINE_LIST);
} else {
- permanentlyHide(ID_ENTITY_ACTIONS);
+ WktComponents.permanentlyHide(this, ID_ENTITY_ACTIONS);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
index 849545c4fb..b75cf11d6b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/scalars/image/JavaAwtImagePanel.java
@@ -29,6 +29,7 @@ import org.apache.causeway.viewer.wicket.model.models.ScalarModel;
import org.apache.causeway.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
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 org.apache.causeway.viewer.wicket.ui.util.WktDecorators;
import org.apache.causeway.viewer.wicket.ui.util.WktTooltips;
@@ -64,7 +65,7 @@ extends PanelAbstract<ManagedObject, ScalarModel> {
new ComponentFeedbackMessageFilter(wicketImage)));
} else {
- permanentlyHide(ID_SCALAR_VALUE, ID_FEEDBACK);
+ WktComponents.permanentlyHide(this, ID_SCALAR_VALUE, ID_FEEDBACK);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
index 4f7664f472..4f1fad17f4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/panels/PanelAbstract.java
@@ -29,7 +29,6 @@ import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
-import org.apache.causeway.viewer.wicket.ui.util.WktComponents;
/**
* Convenience adapter for {@link Panel}s built up using {@link UiComponentType}s.
@@ -79,20 +78,6 @@ extends PanelBase<T> {
return getComponentFactoryRegistry().addOrReplaceComponent(this, uiComponentType, model);
}
- /**
- * For subclasses
- */
- protected void permanentlyHide(final UiComponentType... componentIds) {
- WktComponents.permanentlyHide(this, componentIds);
- }
-
- /**
- * For subclasses
- */
- public void permanentlyHide(final String... ids) {
- WktComponents.permanentlyHide(this, ids);
- }
-
protected static void setVisible(@Nullable final Component component, final boolean visible) {
if(component == null) {
return;