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 2021/11/15 13:48:47 UTC
[isis] branch master updated: ISIS-2893: cleanup prev. commit
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 1acae22 ISIS-2893: cleanup prev. commit
1acae22 is described below
commit 1acae228022b672fcb84b44fa50bc5aa572797f0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 15 14:48:40 2021 +0100
ISIS-2893: cleanup prev. commit
---
.../facets/actions/action/invocation/CommandUtil.java | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java
index 4c199ed..c3eea9e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/CommandUtil.java
@@ -85,22 +85,10 @@ public class CommandUtil {
public boolean matches(
final @Nullable Command command,
final @Nullable ObjectMember objectMember) {
- if(command==null
- || objectMember==null) {
- return false;
- }
- if(!objectMember.isMixedIn()) {
- val featureIdentifier = objectMember.getFeatureIdentifier();
- return (featureIdentifier.getLogicalTypeName() + "#" + featureIdentifier.getMemberLogicalName())
+ return command!=null
+ && objectMember==null
+ && logicalMemberIdentifierFor(objectMember)
.equals(command.getLogicalMemberIdentifier());
- }
-
- return logicalMemberIdentifierFor(objectMember)
- .equals(command.getLogicalMemberIdentifier());
-
- //FIXME[ISIS-2893] eg. when the Command's memberId is "Employment#bookLeave",
- // and the objectMember.getFeatureIdentifier() is "Employment_bookLeave#act"
-
}
// -- HELPER