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 2018/02/22 06:32:50 UTC
[isis] branch master updated: ISIS-1742 remove deprecated
NotContributedFacet.NotContributedAs
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 96d812e ISIS-1742 remove deprecated NotContributedFacet.NotContributedAs
96d812e is described below
commit 96d812e71be2b6ac86cf1101baadbf79b6ed64b8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Feb 22 07:32:47 2018 +0100
ISIS-1742 remove deprecated NotContributedFacet.NotContributedAs
---
...tContributedFacetForActionLayoutAnnotation.java | 6 ++---
.../notcontributed/NotContributedFacet.java | 26 ----------------------
.../NotContributedFacetAbstract.java | 11 +--------
...tributedFacetDerivedFromDomainServiceFacet.java | 2 +-
.../NotContributedFacetDerivedFromMixinFacet.java | 2 +-
5 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
index 17cf9f5..aed70fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/NotContributedFacetForActionLayoutAnnotation.java
@@ -39,17 +39,15 @@ public class NotContributedFacetForActionLayoutAnnotation extends NotContributed
.filter(contributed -> contributed != Contributed.NOT_SPECIFIED)
.findFirst()
.map(contributed -> {
- NotContributedAs as = NotContributedAs.notFrom(contributed);
- return new NotContributedFacetForActionLayoutAnnotation(as, contributed, holder);
+ return new NotContributedFacetForActionLayoutAnnotation(contributed, holder);
})
.orElse(null);
}
private NotContributedFacetForActionLayoutAnnotation(
- final NotContributedAs as,
final Contributed contributed,
final FacetHolder holder) {
- super(as, contributed, holder);
+ super(contributed, holder);
}
}
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 8dbacc1..c2746ba 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,35 +32,9 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
*/
public interface NotContributedFacet extends Facet {
- public NotContributedAs notContributed();
public Contributed contributed();
public boolean toActions();
public boolean toAssociations();
- /**
- * @deprecated
- */
- @Deprecated enum NotContributedAs {
- ACTION,
- ASSOCIATION,
- EITHER,
- NEITHER; /* ie contributed as both ! */
-
- /**
- * @deprecated
- */
- @Deprecated
- public static NotContributedAs notFrom(final Contributed contributed) {
- if(contributed == null) { return null; }
- switch (contributed) {
- case AS_ACTION: return NotContributedAs.ASSOCIATION;
- case AS_ASSOCIATION: return NotContributedAs.ACTION;
- case AS_NEITHER: return NotContributedAs.EITHER;
- case AS_BOTH: return null;
- }
- return null;
- }
-
- }
}
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 5cde40c..a744725 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
@@ -26,7 +26,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public abstract class NotContributedFacetAbstract extends FacetAbstract implements NotContributedFacet {
- private final NotContributedAs as;
private final Contributed contributed;
public static Class<? extends Facet> type() {
@@ -34,28 +33,20 @@ public abstract class NotContributedFacetAbstract extends FacetAbstract implemen
}
public NotContributedFacetAbstract(
- final NotContributedAs as,
final Contributed contributed,
final FacetHolder holder) {
- this(as, contributed, holder, Derivation.NOT_DERIVED);
+ this(contributed, holder, Derivation.NOT_DERIVED);
}
public NotContributedFacetAbstract(
- final NotContributedAs as,
final Contributed contributed,
final FacetHolder holder,
final Derivation derivation) {
super(type(), holder, derivation);
- this.as = as;
this.contributed = contributed;
}
@Override
- public NotContributedAs notContributed() {
- return as;
- }
-
- @Override
public Contributed contributed() {
return contributed;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
index 9e864fd..4e69583 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
@@ -30,7 +30,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacet extends NotContrib
private final NatureOfService natureOfService;
public NotContributedFacetDerivedFromDomainServiceFacet(final NatureOfService natureOfService, final FacetHolder holder) {
- super(NotContributedAs.EITHER, Contributed.AS_NEITHER , holder, Derivation.DERIVED);
+ super(Contributed.AS_NEITHER , holder, Derivation.DERIVED);
this.natureOfService = natureOfService;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
index f65d314..597c5e6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
@@ -31,7 +31,7 @@ public class NotContributedFacetDerivedFromMixinFacet extends NotContributedFace
public NotContributedFacetDerivedFromMixinFacet(
final FacetHolder holder) {
- super(NotContributedAs.NEITHER, Contributed.AS_BOTH, holder, Derivation.DERIVED);
+ super(Contributed.AS_BOTH, holder, Derivation.DERIVED);
}
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.