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/09/15 07:02:04 UTC
[isis] 01/02: ISIS-3198: revert recent change for mixin extra content
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
commit 9f899d34e7e2a6a44421ed0012c3a5ebf5772f6c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 15 08:34:06 2022 +0200
ISIS-3198: revert recent change for mixin extra content
---
.../ui/components/layout/bs/BSGridPanel.java | 37 +++++++++++-----------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
index 7615edc4ac..aa7b77a606 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs/BSGridPanel.java
@@ -26,16 +26,12 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.isis.applib.layout.grid.bootstrap.BSGrid;
import org.apache.isis.applib.layout.grid.bootstrap.BSRow;
import org.apache.isis.core.metamodel.object.ManagedObject;
-import org.apache.isis.core.metamodel.spec.feature.MixedInMember;
-import org.apache.isis.core.metamodel.util.Facets;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.layout.bs.row.Row;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
-import lombok.val;
-
public class BSGridPanel
extends PanelAbstract<ManagedObject, EntityModel> {
@@ -47,22 +43,25 @@ extends PanelAbstract<ManagedObject, EntityModel> {
public static Optional<BSGridPanel> extraContentForMixin(final String id, final ActionModel actionModel) {
- val action = actionModel.getAction();
- if(action.isMixedIn()) {
-
- val mixinSpec = ((MixedInMember)action).getMixinType();
- val targetAdapterForMixin = action.realTargetAdapter(actionModel.getActionOwner());
-
- // if we can bootstrap a grid, use it
- return Facets.bootstrapGrid(mixinSpec, targetAdapterForMixin)
- .map(bsGrid->{
- val commonContext = actionModel.getMetaModelContext();
- val entityModelForMixin =
- EntityModel.ofAdapter(commonContext, targetAdapterForMixin);
- return new BSGridPanel(id, entityModelForMixin, bsGrid);
- });
- }
+ //[ISIS-3210] EntityModel.ofAdapter(commonContext, targetAdapterForMixin); not supported for mixins
return Optional.empty();
+
+// val action = actionModel.getAction();
+// if(action.isMixedIn()) {
+//
+// val mixinSpec = ((MixedInMember)action).getMixinType();
+// val targetAdapterForMixin = action.realTargetAdapter(actionModel.getActionOwner());
+//
+// // if we can bootstrap a grid, use it
+// return Facets.bootstrapGrid(mixinSpec, targetAdapterForMixin)
+// .map(bsGrid->{
+// val commonContext = actionModel.getMetaModelContext();
+// val entityModelForMixin =
+// EntityModel.ofAdapter(commonContext, targetAdapterForMixin);
+// return new BSGridPanel(id, entityModelForMixin, bsGrid);
+// });
+// }
+// return Optional.empty();
}