This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit cc2f5d0736d1db38b189397dbb35a1f14e964712 Author: Dan Haywood <d...@haywood-associates.co.uk> AuthorDate: Wed Feb 14 15:12:56 2018 +0000 ISIS-1740: fixes merge issues (NullSafe moved to applib and renamed) --- .../navparent/annotation/NavigableParentAnnotationFacetFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java index 585228a..3ebb7b8 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java @@ -23,8 +23,8 @@ import java.lang.reflect.Method; import java.util.List; import org.apache.isis.applib.annotation.Parent; +import org.apache.isis.applib.internal.base._NullSafe; import org.apache.isis.core.commons.config.IsisConfiguration; -import org.apache.isis.core.commons.lang.NullSafe; import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facetapi.FacetUtil; import org.apache.isis.core.metamodel.facetapi.FeatureType; @@ -66,7 +66,7 @@ public class NavigableParentAnnotationFacetFactory extends FacetFactoryAbstract final List<Annotations.Evaluator<Parent>> evaluators = Annotations.firstEvaluatorsInHierarchyHaving(cls, Parent.class); - if (NullSafe.isEmpty(evaluators)) { + if (_NullSafe.isEmpty(evaluators)) { return; // no parent resolvable } else if (evaluators.size()>1) { // code should not be reached, since case should be handled by meta-data validation @@ -114,7 +114,7 @@ public class NavigableParentAnnotationFacetFactory extends FacetFactoryAbstract final List<Annotations.Evaluator<Parent>> evaluators = Annotations.firstEvaluatorsInHierarchyHaving(cls, Parent.class); - if (NullSafe.isEmpty(evaluators)) { + if (_NullSafe.isEmpty(evaluators)) { return true; // no conflict, continue validation processing } else if (evaluators.size()>1) { -- To stop receiving notification emails like this one, please contact danhayw...@apache.org.