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 2015/10/14 09:14:16 UTC
isis git commit: ISIS-1213: hide, disable, choices,
default and validity supporting methods now working for mixin actions
and for associations
Repository: isis
Updated Branches:
refs/heads/ISIS-1213 3a299c200 -> 3d176892f
ISIS-1213: hide, disable, choices, default and validity supporting methods now working for mixin actions and for associations
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3d176892
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3d176892
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3d176892
Branch: refs/heads/ISIS-1213
Commit: 3d176892feb564cda2d49baafd081c73a5fdb20b
Parents: 3a299c2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Oct 14 08:14:02 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Oct 14 08:14:02 2015 +0100
----------------------------------------------------------------------
.../facets/MethodPrefixBasedFacetFactoryAbstract.java | 2 +-
.../method/DisableForContextFacetViaMethodFactory.java | 9 +++++++++
.../core/metamodel/specloader/specimpl/MixedInMember.java | 5 +++++
.../metamodel/specloader/specimpl/ObjectActionMixedIn.java | 8 +++++---
.../specloader/specimpl/OneToManyAssociationMixedIn.java | 6 ++++++
.../specloader/specimpl/OneToOneAssociationMixedIn.java | 8 +++++---
6 files changed, 31 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3d176892/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 4d33958..61364d7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -71,7 +71,7 @@ public abstract class MethodPrefixBasedFacetFactoryAbstract
final List<ObjectAction> objectActions = objectSpec.getObjectActions(Contributed.EXCLUDED);
for (final ObjectAction objectAction : objectActions) {
for (final String prefix : prefixes) {
- final String actionId = objectAction.getId();
+ String actionId = objectAction.getId();
if (actionId.startsWith(prefix) && prefix.length() < actionId.length()) {
validationFailures.add(
"%s#%s: has prefix %s, is probably a supporting method for a property, collection or action. If the method is intended to be an action, then rename and use @ActionLayout(named=\"...\") or ignore completely using @Programmatic",
http://git-wip-us.apache.org/repos/asf/isis/blob/3d176892/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index a0f036c..5b9b2e0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -62,12 +62,21 @@ public class DisableForContextFacetViaMethodFactory extends MethodPrefixBasedFac
final String capitalizedName = StringExtensions.asJavaBaseNameStripAccessorPrefixIfRequired(method.getName());
final Class<?> cls = processMethodContext.getCls();
+ // search for exact match
Method disableMethod = MethodFinderUtils.findMethod(
cls, MethodScope.OBJECT,
MethodPrefixConstants.DISABLE_PREFIX + capitalizedName,
new Class<?>[]{String.class, TranslatableString.class},
method.getParameterTypes());
if (disableMethod == null) {
+ // search for no-arg version
+ disableMethod = MethodFinderUtils.findMethod(
+ cls, MethodScope.OBJECT,
+ MethodPrefixConstants.DISABLE_PREFIX + capitalizedName,
+ new Class<?>[]{String.class, TranslatableString.class},
+ new Class<?>[0]);
+ }
+ if (disableMethod == null) {
return;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3d176892/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
index a2fac68..d4841e2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/MixedInMember.java
@@ -23,6 +23,11 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
*/
public interface MixedInMember extends ObjectMember {
+ /**
+ * The id before it has been messed around with if was '_'.
+ */
+ String getOriginalId();
+
// not actually required, as of yet
// boolean isMixinOf(ObjectAction mixinAction);
http://git-wip-us.apache.org/repos/asf/isis/blob/3d176892/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
index 067be24..0a06220 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionMixedIn.java
@@ -25,7 +25,6 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Bulk;
import org.apache.isis.applib.annotation.InvokedOn;
-import org.apache.isis.applib.annotation.NotContributed;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.actinvoc.ActionInvocationContext;
import org.apache.isis.applib.services.bookmark.Bookmark;
@@ -41,8 +40,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.facets.actions.bulk.BulkFacet;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
import org.apache.isis.core.metamodel.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
@@ -114,6 +111,11 @@ public class ObjectActionMixedIn extends ObjectActionDefault implements MixedInM
}
@Override
+ public String getOriginalId() {
+ return super.getId();
+ }
+
+ @Override
public ObjectSpecification getOnType() {
return mixedInType;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3d176892/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
index 1890b3d..e1fa080 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToManyAssociationMixedIn.java
@@ -158,6 +158,11 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
}
@Override
+ public String getOriginalId() {
+ return super.getId();
+ }
+
+ @Override
public Consent isVisible(
final ObjectAdapter mixedInAdapter,
final InteractionInitiatedBy interactionInitiatedBy,
@@ -186,6 +191,7 @@ public class OneToManyAssociationMixedIn extends OneToManyAssociationDefault imp
return facetHolder;
}
+
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/3d176892/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
index 71daf26..8a824cb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationMixedIn.java
@@ -21,7 +21,6 @@ import java.util.List;
import com.google.common.base.Objects;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotation.NotContributed;
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -30,8 +29,6 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacetForContributee;
@@ -146,6 +143,11 @@ public class OneToOneAssociationMixedIn extends OneToOneAssociationDefault imple
}
@Override
+ public String getOriginalId() {
+ return super.getId();
+ }
+
+ @Override
public Consent isVisible(
final ObjectAdapter mixedInAdapter,
final InteractionInitiatedBy interactionInitiatedBy,