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/11/22 20:42:21 UTC
[3/8] isis git commit: ISIS-1257: allow @Title to be specified on a
field rather than on a property.
ISIS-1257: allow @Title to be specified on a field rather than on a property.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2d91415f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2d91415f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2d91415f
Branch: refs/heads/master
Commit: 2d91415f40470bbd59ad66f8dcdf33cc01d11136
Parents: 3aabf7f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Nov 22 19:14:48 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Nov 22 19:14:48 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/isis/applib/annotation/Title.java | 2 +-
.../java/org/apache/isis/core/metamodel/facets/Annotations.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2d91415f/core/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Title.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
index 6bc3b12..f7c3259 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Title.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
* domain object instance. It is used as a marker.
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
+@Target({ ElementType.METHOD, ElementType.FIELD })
public @interface Title {
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/2d91415f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
index 44efeb4..f47f1cc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
@@ -31,6 +31,7 @@ import org.apache.isis.applib.annotation.CollectionLayout;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Title;
public final class Annotations {
@@ -166,6 +167,7 @@ public final class Annotations {
Collection.class,
CollectionLayout.class,
MemberOrder.class,
+ Title.class,
javax.jdo.annotations.Column.class
)
);