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 2018/01/05 00:08:06 UTC
[isis] 02/02: ISIS-1632: fixes test regression
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1632-meta-annotations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d5bacdb3944a1e42dffc4dbed21a9ccfee97da87
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 5 00:07:45 2018 +0000
ISIS-1632: fixes test regression
---
.../metamodel/facets/object/domainservice/DomainServiceMenuOrder.java | 2 +-
.../object/domainservicelayout/DomainServiceLayoutFacetFactory.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
index 1636098..b18fab3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceMenuOrder.java
@@ -41,7 +41,7 @@ public class DomainServiceMenuOrder {
// -- HELPER
- private static String minimumOf(final String dslayoutOrder, final String dsOrder) {
+ public static String minimumOf(final String dslayoutOrder, final String dsOrder) {
if(isUndefined(dslayoutOrder))
return dsOrder;
if(isUndefined(dsOrder))
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index 13afd70..001292a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -27,6 +27,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceMenuOrder;
import org.apache.isis.core.metamodel.facets.object.domainservicelayout.annotation.DomainServiceLayoutFacetAnnotation;
@@ -60,7 +61,7 @@ public class DomainServiceLayoutFacetFactory extends FacetFactoryAbstract {
.findFirst()
.orElse(null);
- final String menuOrder = coalesce(domainServiceLayoutMenuOrder, domainServiceMenuOrder);
+ final String menuOrder = DomainServiceMenuOrder.minimumOf(domainServiceLayoutMenuOrder, domainServiceMenuOrder);
DomainServiceLayout.MenuBar menuBar =
domainServiceLayouts.stream()
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.