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 2013/09/20 18:15:55 UTC
git commit: ISIS-503: BookmarkService provides a contributed action
and a contributed property
Updated Branches:
refs/heads/master 556534ebe -> 3fd5244e0
ISIS-503: BookmarkService provides a contributed action and a contributed property
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3fd5244e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3fd5244e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3fd5244e
Branch: refs/heads/master
Commit: 3fd5244e02cdeb125c5f1587cbfe2ab2d0d99997
Parents: 556534e
Author: Dan Haywood <da...@apache.org>
Authored: Fri Sep 20 17:15:38 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Sep 20 17:15:38 2013 +0100
----------------------------------------------------------------------
.../bookmarks/BookmarkServiceDefault.java | 48 +++++++++++++++++---
1 file changed, 42 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3fd5244e/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
index 1dc97e9..b504efc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
@@ -19,6 +19,8 @@
package org.apache.isis.core.metamodel.services.bookmarks;
import org.apache.isis.applib.annotation.Hidden;
+import org.apache.isis.applib.annotation.NotContributed;
+import org.apache.isis.applib.annotation.NotContributed.As;
import org.apache.isis.applib.annotation.NotInServiceMenu;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
@@ -31,29 +33,63 @@ public class BookmarkServiceDefault implements BookmarkService, DomainObjectServ
private DomainObjectServices domainObjectServices;
+ /**
+ * Contributed action contributed to
+ * any class that implements {@link BookmarkHolder}.
+ *
+ * <p>
+ * If required, applications can suppress by subclassing and annotating the
+ * overridden method with <tt>@Hidden</tt>:
+ * <pre>
+ * @Hidden
+ * public Object lookup(final BookmarkHolder bookmarkHolder) {
+ * return super.lookup(bookmarkHolder);
+ * }
+ * </pre>
+ */
@Override
@NotInServiceMenu
- public Object lookup(BookmarkHolder bookmarkHolder) {
+ @NotContributed(As.ASSOCIATION)
+ public Object lookup(final BookmarkHolder bookmarkHolder) {
Bookmark bookmark = bookmarkHolder.bookmark();
return lookup(bookmark);
}
+ /**
+ * Contributed property (named '<tt>Object</tt>'), contributed to
+ * any class that implements {@link BookmarkHolder}.
+ *
+ * <p>
+ * If required, applications can suppress by subclassing and annotating the
+ * overridden method with <tt>@Hidden</tt>:
+ * <pre>
+ * @Hidden
+ * public Object object(final BookmarkHolder bookmarkHolder) {
+ * return super.object(bookmarkHolder);
+ * }
+ * </pre>
+ */
+ @NotInServiceMenu
+ @NotContributed(As.ACTION)
+ public Object object(final BookmarkHolder bookmarkHolder) {
+ return lookup(bookmarkHolder);
+ }
+
@Hidden
- public Object lookup(Bookmark bookmark) {
- Object lookup = domainObjectServices.lookup(bookmark);
- return lookup;
+ public Object lookup(final Bookmark bookmark) {
+ return domainObjectServices.lookup(bookmark);
}
@Override
@Programmatic
- public void setDomainObjectServices(DomainObjectServices domainObjectServices) {
+ public void setDomainObjectServices(final DomainObjectServices domainObjectServices) {
this.domainObjectServices = domainObjectServices;
}
@Override
@Hidden
- public Bookmark bookmarkFor(Object domainObject) {
+ public Bookmark bookmarkFor(final Object domainObject) {
return domainObjectServices.bookmarkFor(domainObject);
}