You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/10/26 07:29:06 UTC
[isis] branch dev/2.0.0/ISIS-1742-remove-deprecations updated
(2c8ddaa -> 10b9e04)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 2c8ddaa ISIS-1742: removes "notInServiceMenu" prefix, "name" prefix, "plural" prefix, "description", "optional", "alwaysHide", "protect" prefixes.
add 74befd5 Update _rgsvc_integration-api_BookmarkService.adoc
add f9f0418 Update _rgsvc_integration-api_BookmarkService.adoc
add ddc251a Merge pull request #107 from ppirus/patch-8
add c7f738e Update _ugfun_building-blocks_identifiers_oid.adoc
add b323e58 Merge pull request #106 from ppirus/patch-7
add ebefcb3 Update _rgant-DomainObject_nature.adoc
add 67cea8a Merge pull request #108 from ppirus/patch-9
add aed996d ISIS-1465: adds stuff on cgcom rel process
add b6e96db ISIS-1752: adds new 'menuBars' resource to RO viewer
add edcebfa adds new 'menuBars' resource to RO viewer
add 0173c20 fixes comment in github-pr.sh
add 00ce18d Merge remote-tracking branch 'origin/master'
add b08d3c2 ISIS-1752: moves oid from MenuSection down into ActionLayout, so that could support custom menus in the future.
add 19a47a8 Merge branch 'ISIS-1752-menu-layout-resource'
add d70337f ISIS-1752: factors out MenuBarsService, refactors Wicket UI to use MenuBarsService.
add 1360bc3 ISIS-1752: deletes unused methods in ServiceActionUtil (now within MenuBarsServiceDefault).
add 0b7f445 ISIS-1572: adds outline docs for MenuBarsService
add bc5fdbe ISIS-1752: fixes unit test
add 1b9db57 ISIS-1752: removes unused import
new 70e6bd1 Merge branch 'master' into dev/2.0.0/ISIS-1742-remove-deprecations
new 63cded2 ISIS-1742: having to delete unit test again (?!?) after merge from master.
new ec9ee59 ISIS-1742: removes merge conflict markers accidentally left in file
new 10b9e04 ISIS-1742: replaces Filter with Predicate in new MenuBarsServiceDefault
The 4 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:
.../guides/cgcom/_cgcom_cutting-a-release.adoc | 9 +-
.../cgcom/images/docker/020-docker-nat-public.png | Bin 0 -> 28329 bytes
.../images/docker/022-local-security-policy.png | Bin 0 -> 29071 bytes
.../images/docker/024-unidentified-are-private.png | Bin 0 -> 7330 bytes
.../cgcom/images/docker/026-docker-nat-private.png | Bin 0 -> 28808 bytes
.../cgcom/images/{ => docker}/docker-daemon.png | Bin
.../guides/rgant/_rgant-DomainObject_nature.adoc | 6 +-
.../_rgsvc_integration-api_BookmarkService.adoc | 2 +-
.../_rgsvc_presentation-layer-spi_GridService.adoc | 35 ++-
...vc_presentation-layer-spi_MenuBarsService.adoc} | 40 ++--
.../_ugfun_building-blocks_identifiers_oid.adoc | 2 +-
.../{component => menus}/ActionLayoutData.java | 107 +++------
.../ActionLayoutDataOwner.java | 4 +-
.../org/apache/isis/applib/layout/menus/Menu.java | 93 ++++++++
.../apache/isis/applib/layout/menus/MenuBar.java} | 42 ++--
.../apache/isis/applib/layout/menus/MenuBars.java | 111 ++++++++++
.../isis/applib/layout/menus/MenuSection.java} | 41 +++-
.../layout/{component => menus}/package-info.java | 9 +-
.../fixturespec/FixtureScriptsDefault.java | 6 +
.../isis/applib/services/menu/MenuBarsService.java | 9 +
.../services/swagger/SwaggerServiceMenu.java | 44 +++-
.../layout/menus/MenuBars_roundtrip_Test.java | 79 +++++++
.../NotInServiceMenuMethodFacetFactoryTest.java | 73 ------
.../services/menu/MenuBarsServiceDefault.java | 245 +++++++++++++++++++++
.../runtime/services/menu/ServiceAndAction.java | 27 +++
.../isis/viewer/restfulobjects/applib/Rel.java | 1 +
.../restfulobjects/applib/RepresentationType.java | 4 +
.../restfulobjects/applib/RestfulMediaType.java | 2 +
.../MenuBarsResource.java} | 41 ++--
.../server/RestfulObjectsApplication.java | 2 +
.../server/resources/HomePageReprRenderer.java | 9 +-
.../resources/HomePageResourceServerside.java | 5 +
...erside.java => MenuBarsResourceServerside.java} | 55 +++--
.../serviceactions/ServiceActionUtil.java | 235 +++++++-------------
.../serviceactions/ServiceActionsPanelFactory.java | 20 +-
.../serviceactions/TertiaryActionsPanel.html | 12 +
.../serviceactions/TertiaryMenuPanelFactory.java | 20 +-
github-pr.sh | 2 +-
38 files changed, 970 insertions(+), 422 deletions(-)
create mode 100644 adocs/documentation/src/main/asciidoc/guides/cgcom/images/docker/020-docker-nat-public.png
create mode 100644 adocs/documentation/src/main/asciidoc/guides/cgcom/images/docker/022-local-security-policy.png
create mode 100644 adocs/documentation/src/main/asciidoc/guides/cgcom/images/docker/024-unidentified-are-private.png
create mode 100644 adocs/documentation/src/main/asciidoc/guides/cgcom/images/docker/026-docker-nat-private.png
rename adocs/documentation/src/main/asciidoc/guides/cgcom/images/{ => docker}/docker-daemon.png (100%)
copy adocs/documentation/src/main/asciidoc/guides/{rgant/_rgant-Action_typeOf.adoc => rgsvc/_rgsvc_presentation-layer-spi_MenuBarsService.adoc} (51%)
copy core/applib/src/main/java/org/apache/isis/applib/layout/{component => menus}/ActionLayoutData.java (68%)
copy core/applib/src/main/java/org/apache/isis/applib/layout/{component => menus}/ActionLayoutDataOwner.java (90%)
create mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/menus/Menu.java
copy core/{viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java => applib/src/main/java/org/apache/isis/applib/layout/menus/MenuBar.java} (51%)
create mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/menus/MenuBars.java
copy core/{viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/ListOfLinksModel.java => applib/src/main/java/org/apache/isis/applib/layout/menus/MenuSection.java} (54%)
copy core/applib/src/main/java/org/apache/isis/applib/layout/{component => menus}/package-info.java (79%)
create mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/menu/MenuBarsService.java
create mode 100644 core/applib/src/test/java/org/apache/isis/applib/layout/menus/MenuBars_roundtrip_Test.java
delete mode 100644 core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuMethodFacetFactoryTest.java
create mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
create mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/ServiceAndAction.java
copy core/viewer-restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/{user/UserResource.java => menubars/MenuBarsResource.java} (65%)
copy core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/{HomePageResourceServerside.java => MenuBarsResourceServerside.java} (59%)
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].
[isis] 01/04: Merge branch 'master' into
dev/2.0.0/ISIS-1742-remove-deprecations
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 70e6bd11008332dcc3c209b15ffb2d0a2e6d61dc
Merge: 2c8ddaa 1b9db57
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 26 08:20:39 2017 +0100
Merge branch 'master' into dev/2.0.0/ISIS-1742-remove-deprecations
.../guides/cgcom/_cgcom_cutting-a-release.adoc | 9 +-
.../cgcom/images/docker/020-docker-nat-public.png | Bin 0 -> 28329 bytes
.../images/docker/022-local-security-policy.png | Bin 0 -> 29071 bytes
.../images/docker/024-unidentified-are-private.png | Bin 0 -> 7330 bytes
.../cgcom/images/docker/026-docker-nat-private.png | Bin 0 -> 28808 bytes
.../cgcom/images/{ => docker}/docker-daemon.png | Bin
.../guides/rgant/_rgant-DomainObject_nature.adoc | 6 +-
.../_rgsvc_integration-api_BookmarkService.adoc | 2 +-
.../_rgsvc_presentation-layer-spi_GridService.adoc | 35 ++-
...svc_presentation-layer-spi_MenuBarsService.adoc | 41 ++++
.../_ugfun_building-blocks_identifiers_oid.adoc | 2 +-
.../isis/applib/layout/menus/ActionLayoutData.java | 220 ++++++++++++++++++
.../applib/layout/menus/ActionLayoutDataOwner.java | 28 +++
.../org/apache/isis/applib/layout/menus/Menu.java | 93 ++++++++
.../apache/isis/applib/layout/menus/MenuBar.java | 61 +++++
.../apache/isis/applib/layout/menus/MenuBars.java | 111 ++++++++++
.../isis/applib/layout/menus/MenuSection.java | 62 ++++++
.../isis/applib/layout/menus/package-info.java | 38 ++++
.../fixturespec/FixtureScriptsDefault.java | 6 +
.../isis/applib/services/menu/MenuBarsService.java | 9 +
.../services/swagger/SwaggerServiceMenu.java | 44 +++-
.../layout/menus/MenuBars_roundtrip_Test.java | 79 +++++++
.../services/menu/MenuBarsServiceDefault.java | 245 +++++++++++++++++++++
.../runtime/services/menu/ServiceAndAction.java | 27 +++
.../isis/viewer/restfulobjects/applib/Rel.java | 1 +
.../restfulobjects/applib/RepresentationType.java | 4 +
.../restfulobjects/applib/RestfulMediaType.java | 2 +
.../applib/menubars/MenuBarsResource.java | 65 ++++++
.../server/RestfulObjectsApplication.java | 2 +
.../server/resources/HomePageReprRenderer.java | 9 +-
.../resources/HomePageResourceServerside.java | 5 +
...erside.java => MenuBarsResourceServerside.java} | 55 +++--
.../serviceactions/ServiceActionUtil.java | 219 +++++++-----------
.../serviceactions/ServiceActionsPanelFactory.java | 20 +-
.../serviceactions/TertiaryActionsPanel.html | 12 +
.../serviceactions/TertiaryMenuPanelFactory.java | 20 +-
github-pr.sh | 2 +-
37 files changed, 1344 insertions(+), 190 deletions(-)
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 70fc205,ece262f..af8d968
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@@ -20,28 -20,14 +20,36 @@@
package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
import java.util.List;
- import java.util.Map;
- import java.util.Set;
++<<<<<<< HEAD
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.services.i18n.TranslationService;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
+import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.Contributed;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
+import org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
++=======
+ import com.google.common.base.Function;
+ import com.google.common.base.Strings;
+ import com.google.common.collect.FluentIterable;
+ import com.google.common.collect.ImmutableBiMap;
+ import com.google.common.collect.ImmutableMap;
+ import com.google.common.collect.Lists;
+
++>>>>>>> master
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@@ -192,47 -197,57 +219,56 @@@ public final class ServiceActionUtil
folderItem.add(subMenuItemsView);
}
- public static List<CssMenuItem> buildMenu(final ServiceActionsModel appActionsModel) {
-
- final List<ObjectAdapter> serviceAdapters = appActionsModel.getObject();
-
- final List<ServiceAndAction> serviceActions = Lists.newArrayList();
- for (final ObjectAdapter serviceAdapter : serviceAdapters) {
- collateServiceActions(serviceAdapter, ActionType.USER, serviceActions);
- collateServiceActions(serviceAdapter, ActionType.PROTOTYPE, serviceActions);
- }
-
- final Set<String> serviceNamesInOrder = serviceNamesInOrder(serviceAdapters, serviceActions);
- final Map<String, List<ServiceAndAction>> serviceActionsByName = groupByServiceName(serviceActions);
-
- // prune any service names that have no service actions
- serviceNamesInOrder.retainAll(serviceActionsByName.keySet());
+ public static List<CssMenuItem> buildMenu(
+ final MenuBars menuBars,
+ final ServiceActionsModel serviceActionsModel) {
- return buildMenuItems(serviceNamesInOrder, serviceActionsByName);
- }
+ final MenuBar menuBar = menuBars.menuBarFor(serviceActionsModel.getMenuBar());
- /**
- * Builds a hierarchy of {@link CssMenuItem}s, following the provided map of {@link ServiceAndAction}s (keyed by their service Name).
- */
- private static List<CssMenuItem> buildMenuItems(
- final Set<String> serviceNamesInOrder,
- final Map<String, List<ServiceAndAction>> serviceActionsByName) {
+ final List<ObjectAdapter> serviceAdapters = serviceActionsModel.getObject();
+ final ImmutableMap<ObjectAdapter, String> oidByServiceAdapter = FluentIterable.from(serviceAdapters)
+ .toMap(new Function<ObjectAdapter, String>() {
+ @Override
+ public String apply(final ObjectAdapter objectAdapter) {
+ return objectAdapter.getOid().enStringNoVersion();
+ }
+ });
+ final ImmutableBiMap<String, ObjectAdapter> serviceAdapterByOid = ImmutableBiMap
+ .copyOf(oidByServiceAdapter).inverse();
final List<CssMenuItem> menuItems = Lists.newArrayList();
- for (String serviceName : serviceNamesInOrder) {
- final CssMenuItem serviceMenuItem = CssMenuItem.newMenuItem(serviceName).build();
- final List<ServiceAndAction> serviceActionsForName = serviceActionsByName.get(serviceName);
- for (ServiceAndAction serviceAndAction : serviceActionsForName) {
-
- final CssMenuItem.Builder subMenuItemBuilder = serviceMenuItem.newSubMenuItem(serviceAndAction);
- if (subMenuItemBuilder == null) {
- // either service or this action is not visible
- continue;
+ for (final Menu menu : menuBar.getMenus()) {
+
+ final CssMenuItem serviceMenu = CssMenuItem.newMenuItem(menu.getNamed()).build();
+
-
+ for (final MenuSection menuSection : menu.getSections()) {
+
+ boolean firstSection = true;
+
+ for (final ActionLayoutData actionLayoutData : menuSection.getActions()) {
+ final String oid = actionLayoutData.getOid();
+ final ObjectAdapter serviceAdapter = serviceAdapterByOid.get(oid);
+ final EntityModel entityModel = new EntityModel(serviceAdapter);
+ final ObjectAction objectAction = serviceAdapter.getSpecification()
+ .getObjectAction(actionLayoutData.getId());
+ final ServiceAndAction serviceAndAction =
+ new ServiceAndAction(actionLayoutData.getNamed(), entityModel, objectAction);
+
+ if(firstSection) {
+ serviceAndAction.separator = true;
+ firstSection = false;
+ }
+
+ final CssMenuItem.Builder subMenuItemBuilder = serviceMenu.newSubMenuItem(serviceAndAction);
+ if (subMenuItemBuilder == null) {
+ // either service or this action is not visible
+ continue;
+ }
+ subMenuItemBuilder.build();
}
- subMenuItemBuilder.build();
}
- if (serviceMenuItem.hasSubMenuItems()) {
- menuItems.add(serviceMenuItem);
+ if (serviceMenu.hasSubMenuItems()) {
+ menuItems.add(serviceMenu);
}
}
return menuItems;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 02/04: ISIS-1742: having to delete unit test again (?!?)
after merge from master.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 63cded262e56b99b6a68ce955dff06d49f56053c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 26 08:23:40 2017 +0100
ISIS-1742: having to delete unit test again (?!?) after merge from master.
---
.../NotInServiceMenuMethodFacetFactoryTest.java | 73 ----------------------
1 file changed, 73 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuMethodFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuMethodFacetFactoryTest.java
deleted file mode 100644
index 4b9be47..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/method/NotInServiceMenuMethodFacetFactoryTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.notinservicemenu.method;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacetAbstract;
-
-public class NotInServiceMenuMethodFacetFactoryTest extends AbstractFacetFactoryTest {
-
- private NotInServiceMenuFacetViaMethodFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new NotInServiceMenuFacetViaMethodFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testSupportingMethodForActionPickedUp() {
- // given
- class CustomerRepository {
- @SuppressWarnings("unused")
- public void someAction() {
- }
-
- @SuppressWarnings("unused")
- public boolean notInServiceMenuSomeAction() {
- return true;
- }
- }
- final Method actionMethod = findMethod(CustomerRepository.class, "someAction");
-
- // when
- facetFactory.process(new ProcessMethodContext(CustomerRepository.class, null, actionMethod, methodRemover, facetedMethod));
-
- // then
- final Facet facet = facetedMethod.getFacet(NotInServiceMenuFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NotInServiceMenuFacetAbstract);
-
- // assertNoMethodsRemoved();
- assertEquals(1, methodRemover.getRemovedMethodMethodCalls().size());
- }
-
-}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 03/04: ISIS-1742: removes merge conflict markers
accidentally left in file
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ec9ee590771388cd3f4cbe5d5be695d4c87de6a2
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 26 08:28:29 2017 +0100
ISIS-1742: removes merge conflict markers accidentally left in file
---
.../serviceactions/ServiceActionUtil.java | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index af8d968..38c648d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -21,27 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
import java.util.List;
-<<<<<<< HEAD
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
-import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
-import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.ActionType;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.Contributed;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.IsisSystem;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
-import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
-import org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-=======
import com.google.common.base.Function;
import com.google.common.base.Strings;
import com.google.common.collect.FluentIterable;
@@ -49,7 +28,6 @@ import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
->>>>>>> master
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.
[isis] 04/04: ISIS-1742: replaces Filter with Predicate in new
MenuBarsServiceDefault
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 10b9e0436116242353bd214231a83a2bb189a625
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 26 08:28:54 2017 +0100
ISIS-1742: replaces Filter with Predicate in new MenuBarsServiceDefault
---
.../isis/core/runtime/services/menu/MenuBarsServiceDefault.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
index 684b365..eae62df 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menu/MenuBarsServiceDefault.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.inject.Inject;
import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
import com.google.common.base.Strings;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Lists;
@@ -35,7 +36,6 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.layout.menus.ActionLayoutData;
import org.apache.isis.applib.layout.menus.Menu;
import org.apache.isis.applib.layout.menus.MenuBar;
@@ -210,7 +210,7 @@ public class MenuBarsServiceDefault implements MenuBarsService {
}
for (final ObjectAction objectAction : serviceSpec.getObjectActions(
- actionType, Contributed.INCLUDED, Filters.<ObjectAction>any())) {
+ actionType, Contributed.INCLUDED, Predicates.<ObjectAction>alwaysTrue())) {
// skip if annotated to not be included in repository menu using legacy mechanism
if (objectAction.getFacet(NotInServiceMenuFacet.class) != null) {
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.