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:03 UTC
[isis] branch master updated (4a43b8b8ac -> a857249010)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from 4a43b8b8ac ISIS-3198: fixes prev. commit
new 9f899d34e7 ISIS-3198: revert recent change for mixin extra content
new a857249010 ISIS-3198: minor: set some explicit transitivities
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/model/src/main/java/module-info.java | 8 ++---
.../wicket/model/src/main/java/module-info.java | 12 +++----
.../ui/components/layout/bs/BSGridPanel.java | 37 +++++++++++-----------
3 files changed, 28 insertions(+), 29 deletions(-)
[isis] 01/02: ISIS-3198: revert recent change for mixin extra content
Posted by ah...@apache.org.
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();
}
[isis] 02/02: ISIS-3198: minor: set some explicit transitivities
Posted by ah...@apache.org.
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 a8572490109cf07ebd5063bcb3a09bfd915455fc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 15 09:01:56 2022 +0200
ISIS-3198: minor: set some explicit transitivities
---
viewers/commons/model/src/main/java/module-info.java | 8 ++++----
viewers/wicket/model/src/main/java/module-info.java | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/viewers/commons/model/src/main/java/module-info.java b/viewers/commons/model/src/main/java/module-info.java
index b106454fea..70a009c00a 100644
--- a/viewers/commons/model/src/main/java/module-info.java
+++ b/viewers/commons/model/src/main/java/module-info.java
@@ -30,9 +30,9 @@ module org.apache.isis.viewer.commons.model {
exports org.apache.isis.viewer.commons.model.scalar;
requires lombok;
- requires org.apache.isis.applib;
- requires org.apache.isis.commons;
- requires org.apache.isis.core.config;
- requires org.apache.isis.core.metamodel;
+ requires transitive org.apache.isis.applib;
+ requires transitive org.apache.isis.commons;
+ requires transitive org.apache.isis.core.config;
+ requires transitive org.apache.isis.core.metamodel;
requires spring.core;
}
\ No newline at end of file
diff --git a/viewers/wicket/model/src/main/java/module-info.java b/viewers/wicket/model/src/main/java/module-info.java
index 0e98040940..9342d0252e 100644
--- a/viewers/wicket/model/src/main/java/module-info.java
+++ b/viewers/wicket/model/src/main/java/module-info.java
@@ -34,13 +34,13 @@ module org.apache.isis.viewer.wicket.model {
requires jakarta.activation;
requires lombok;
- requires org.apache.isis.applib;
- requires org.apache.isis.commons;
- requires org.apache.isis.core.config;
- requires org.apache.isis.core.metamodel;
+ requires transitive org.apache.isis.applib;
+ requires transitive org.apache.isis.commons;
+ requires transitive org.apache.isis.core.config;
+ requires transitive org.apache.isis.core.metamodel;
requires org.apache.isis.core.webapp;
- requires org.apache.isis.viewer.commons.applib;
- requires org.apache.isis.viewer.commons.model;
+ requires transitive org.apache.isis.viewer.commons.applib;
+ requires transitive org.apache.isis.viewer.commons.model;
requires org.apache.logging.log4j;
requires org.danekja.jdk.serializable.functional;
requires org.slf4j;