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 2020/04/10 13:34:44 UTC
[isis] branch master updated: ISIS-2340: menu action models are
just action models
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 a3817dc ISIS-2340: menu action models are just action models
a3817dc is described below
commit a3817dcb2860c51cc72fcb30e30ae00a3adf669b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 10 15:34:32 2020 +0200
ISIS-2340: menu action models are just action models
---
.../viewer/vaadin/model/action/MenuActionFactoryVaa.java | 12 ++++++------
.../action/{MenuActionFactory.java => ActionFactory.java} | 8 ++++----
.../apache/isis/viewer/common/model/menu/MenuUiModel.java | 4 ++--
.../viewer/common/model/menu/MenuUiModel_buildMenuItems.java | 10 +++++-----
.../actionmenu/serviceactions/ServiceActionUtil.java | 10 +++++-----
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/MenuActionFactoryVaa.java b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/MenuActionFactoryVaa.java
index 6402504..c13ceae 100644
--- a/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/MenuActionFactoryVaa.java
+++ b/incubator/viewers/vaadin/model/src/main/java/org/apache/isis/incubator/viewer/vaadin/model/action/MenuActionFactoryVaa.java
@@ -24,18 +24,18 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.incubator.viewer.vaadin.model.entity.ObjectVaa;
-import org.apache.isis.viewer.common.model.action.MenuActionFactory;
+import org.apache.isis.viewer.common.model.action.ActionFactory;
import lombok.val;
-public class MenuActionFactoryVaa implements MenuActionFactory<Component> {
+public class MenuActionFactoryVaa implements ActionFactory<Component> {
@Override
- public MenuActionVaa newMenuAction(
+ public MenuActionVaa newAction(
IsisWebAppCommonContext commonContext,
- String named,
- ObjectAction objectAction,
- ManagedObject actionHolder) {
+ String named,
+ ManagedObject actionHolder,
+ ObjectAction objectAction) {
val objectModel = new ObjectVaa(commonContext, actionHolder);
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/MenuActionFactory.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionFactory.java
similarity index 88%
rename from viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/MenuActionFactory.java
rename to viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionFactory.java
index 29552cb..eecc58c 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/MenuActionFactory.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionFactory.java
@@ -22,12 +22,12 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-public interface MenuActionFactory<T> {
+public interface ActionFactory<T> {
- ActionUiModel<T> newMenuAction(
+ ActionUiModel<T> newAction(
IsisWebAppCommonContext commonContext,
String named,
- ObjectAction objectAction,
- ManagedObject actionHolder);
+ ManagedObject actionHolder,
+ ObjectAction objectAction);
}
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
index e9e62ec..c2c5a65 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
@@ -27,7 +27,7 @@ import java.util.function.Function;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.viewer.common.model.action.MenuActionFactory;
+import org.apache.isis.viewer.common.model.action.ActionFactory;
import org.apache.isis.viewer.common.model.menuitem.MenuItemUiModel;
import org.apache.isis.viewer.common.model.userprofile.UserProfileUiModelProvider;
@@ -52,7 +52,7 @@ public class MenuUiModel implements Serializable {
public <T, M extends MenuItemUiModel<T, M>>
void buildMenuItems(
final IsisWebAppCommonContext commonContext,
- final MenuActionFactory<T> menuActionFactory,
+ final ActionFactory<T> menuActionFactory,
final Function<String, M> menuItemFactory,
final Consumer<M> onNewMenuItem) {
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
index 10e0807..e161d42 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
@@ -24,7 +24,7 @@ import java.util.function.Function;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBar;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.viewer.common.model.action.MenuActionFactory;
+import org.apache.isis.viewer.common.model.action.ActionFactory;
import org.apache.isis.viewer.common.model.menuitem.MenuItemUiModel;
import lombok.val;
@@ -37,7 +37,7 @@ final class MenuUiModel_buildMenuItems {
void buildMenuItems(
final IsisWebAppCommonContext commonContext,
final BS3MenuBar menuBar,
- final MenuActionFactory<T> menuActionFactory,
+ final ActionFactory<T> menuActionFactory,
final Function<String, M> menuItemFactory,
final Consumer<M> onNewMenuItem) {
@@ -75,11 +75,11 @@ final class MenuUiModel_buildMenuItems {
val isFirstInSection = itemsPerSectionCounter.intValue()==0;
- val menuActionUiModel = menuActionFactory.newMenuAction(
+ val menuActionUiModel = menuActionFactory.newAction(
commonContext,
actionLayoutData.getNamed(),
- objectAction,
- serviceAdapter);
+ serviceAdapter,
+ objectAction);
// Optionally creates a sub-menu item based on visibility and usability
menuItemModel.addSubMenuItemFor(
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 7c485b1..9c6b3c9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.viewer.common.model.action.MenuActionFactory;
+import org.apache.isis.viewer.common.model.action.ActionFactory;
import org.apache.isis.viewer.common.model.menu.MenuUiModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
@@ -141,14 +141,14 @@ public final class ServiceActionUtil {
}
- private static class MenuActionFactoryWkt implements MenuActionFactory<AbstractLink> {
+ private static class MenuActionFactoryWkt implements ActionFactory<AbstractLink> {
@Override
- public MenuActionWkt newMenuAction(
+ public MenuActionWkt newAction(
IsisWebAppCommonContext commonContext,
String named,
- ObjectAction objectAction,
- ManagedObject serviceAction) {
+ ManagedObject serviceAction,
+ ObjectAction objectAction) {
val objectModel = EntityModel.ofAdapter(commonContext, serviceAction);