Updated Branches: refs/heads/master 461fe5eac -> f067a9c87
ISIS-285: fix for way in which locate hide or disable methods... .. so that the new metamodel validation doesn't throw up false positives Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f067a9c8 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f067a9c8 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f067a9c8 Branch: refs/heads/master Commit: f067a9c879746f4f8a48afde30bb14aa465ee0b9 Parents: 461fe5e Author: Dan Haywood <[email protected]> Authored: Wed Dec 19 08:01:21 2012 +0000 Committer: Dan Haywood <[email protected]> Committed: Wed Dec 19 08:01:21 2012 +0000 ---------------------------------------------------------------------- .gitignore | 1 + .../DisabledFacetViaDisableMethodFacetFactory.java | 2 +- .../HiddenFacetViaHideMethodFacetFactory.java | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/f067a9c8/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 96b2722..de717da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *.swp *.class +bin/ target/ target-ide/ logs/ http://git-wip-us.apache.org/repos/asf/isis/blob/f067a9c8/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/method/DisabledFacetViaDisableMethodFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/method/DisabledFacetViaDisableMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/method/DisabledFacetViaDisableMethodFacetFactory.java index 399bb9b..4c70c6b 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/method/DisabledFacetViaDisableMethodFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/disabled/method/DisabledFacetViaDisableMethodFacetFactory.java @@ -58,7 +58,7 @@ public class DisabledFacetViaDisableMethodFacetFactory extends MethodPrefixBased final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(method.getName()); final Class<?> cls = processMethodContext.getCls(); - final Method disableMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.DISABLE_PREFIX + capitalizedName, String.class, new Class[] {}); + final Method disableMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.DISABLE_PREFIX + capitalizedName, String.class, method.getParameterTypes()); if (disableMethod == null) { return; } http://git-wip-us.apache.org/repos/asf/isis/blob/f067a9c8/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/method/HiddenFacetViaHideMethodFacetFactory.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/method/HiddenFacetViaHideMethodFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/method/HiddenFacetViaHideMethodFacetFactory.java index 37ce409..c32e0fd 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/method/HiddenFacetViaHideMethodFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/members/hidden/method/HiddenFacetViaHideMethodFacetFactory.java @@ -58,9 +58,12 @@ public class HiddenFacetViaHideMethodFacetFactory extends MethodPrefixBasedFacet final String capitalizedName = NameUtils.javaBaseNameStripAccessorPrefixIfRequired(getMethod.getName()); final Class<?> cls = processMethodContext.getCls(); - final Method hideMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.HIDE_PREFIX + capitalizedName, boolean.class, new Class[] {}); + Method hideMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.HIDE_PREFIX + capitalizedName, boolean.class, new Class[] {}); if (hideMethod == null) { - return; + hideMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodPrefixConstants.HIDE_PREFIX + capitalizedName, boolean.class, getMethod.getParameterTypes()); + if (hideMethod == null) { + return; + } } processMethodContext.removeMethod(hideMethod);
