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/09 16:30:21 UTC
[isis] 10/10: ISIS-1742: renames NotContributedFacet methods
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 07fed9de5aad31debdaee9518d6597380171c284
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 9 17:24:33 2017 +0100
ISIS-1742: renames NotContributedFacet methods
---
.../facets/actions/notcontributed/NotContributedFacet.java | 4 ++--
.../actions/notcontributed/NotContributedFacetAbstract.java | 10 ++++++----
.../ActionLayoutAnnotationFacetFactoryJunit4Test.java | 13 +++++++++----
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
index a82b085..8dbacc1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
@@ -32,8 +32,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
*/
public interface NotContributedFacet extends Facet {
- public NotContributedAs value();
- public Contributed inverseValue();
+ public NotContributedAs notContributed();
+ public Contributed contributed();
public boolean toActions();
public boolean toAssociations();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
index 9c70d64..5cde40c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
@@ -51,23 +51,25 @@ public abstract class NotContributedFacetAbstract extends FacetAbstract implemen
}
@Override
- public NotContributedAs value() {
+ public NotContributedAs notContributed() {
return as;
}
@Override
- public Contributed inverseValue() {
+ public Contributed contributed() {
return contributed;
}
@Override
public boolean toActions() {
- return value() == NotContributedAs.EITHER || value() == NotContributedAs.ACTION;
+ // not contributed to actions if...
+ return contributed() == Contributed.AS_NEITHER || contributed() == Contributed.AS_ASSOCIATION;
}
@Override
public boolean toAssociations() {
- return value() == NotContributedAs.EITHER || value() == NotContributedAs.ASSOCIATION;
+ // not contributed to associations if...
+ return contributed() == Contributed.AS_NEITHER || contributed() == Contributed.AS_ACTION;
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
index 999674c..d54eea3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
@@ -156,7 +156,8 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ACTION));
+ assertThat(facetImpl.notContributed(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ACTION));
+ assertThat(facetImpl.contributed(), CoreMatchers.equalTo(Contributed.AS_ASSOCIATION));
}
@@ -194,7 +195,8 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ASSOCIATION));
+ assertThat(facetImpl.notContributed(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.ASSOCIATION));
+ assertThat(facetImpl.contributed(), CoreMatchers.equalTo(Contributed.AS_ACTION));
}
@Test
@@ -230,7 +232,9 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
+ assertThat(facetImpl.notContributed(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
+ assertThat(facetImpl.contributed(), CoreMatchers.equalTo(Contributed.AS_NEITHER));
+
}
@Test
@@ -267,7 +271,8 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
assertThat(facet, CoreMatchers.is(not(nullValue())));
assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facetImpl.value(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
+ assertThat(facetImpl.notContributed(), CoreMatchers.equalTo(NotContributedFacet.NotContributedAs.EITHER));
+ assertThat(facetImpl.contributed(), CoreMatchers.equalTo(Contributed.AS_NEITHER));
}
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.