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 2020/01/24 08:07:33 UTC
[isis] branch master updated: ISIS-2158: remove experimental
TypedTuple + sync adoc
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 4c96d69 ISIS-2158: remove experimental TypedTuple + sync adoc
4c96d69 is described below
commit 4c96d69553562cb302d41203a75ac14d00d024ee
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 24 09:07:20 2020 +0100
ISIS-2158: remove experimental TypedTuple + sync adoc
---
.../examples/mixins/metamodel/Object_objectIdentifier.java | 11 ++++++++---
.../applib-svc/examples/services/bookmark/Bookmark.java | 4 ++++
.../main/java/org/apache/isis/applib/value/TypedTuple.java | 10 ----------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
index f74af70..eef7817 100644
--- a/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
+++ b/api/applib/src/main/adoc/modules/applib-cm/examples/mixins/metamodel/Object_objectIdentifier.java
@@ -30,6 +30,8 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.mixins.MixinConstants;
import org.apache.isis.applib.services.bookmark.BookmarkService;
+import org.apache.isis.applib.services.metamodel.MetaModelService;
+import org.apache.isis.core.commons.internal.base._Strings;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -39,6 +41,7 @@ import lombok.val;
public class Object_objectIdentifier {
@Inject private BookmarkService bookmarkService;
+ @Inject private MetaModelService mmService;
private final Object holder;
@@ -56,10 +59,12 @@ public class Object_objectIdentifier {
@MemberOrder(name = MixinConstants.METADATA_LAYOUT_GROUPNAME, sequence = "700.2")
public String prop() {
val bookmark = bookmarkService.bookmarkForElseThrow(this.holder);
- return bookmark.getIdentifier();
+ val sort = mmService.sortOf(bookmark, MetaModelService.Mode.RELAXED);
+ if(sort.isEntity()) {
+ return bookmark.getIdentifier();
+ }
+ return _Strings.ellipsifyAtStart(bookmark.getIdentifier(), 16, "…");
}
-
-
}
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
index 69f4658..5d42a8a 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
@@ -46,6 +46,10 @@ public class Bookmark implements Serializable {
protected static final String SEPARATOR = ":";
+ /**
+ * corresponds directly to the object's specification-id
+ * @see <tt>RootOid</tt>
+ */
@NonNull private final String objectType;
@NonNull private final String identifier;
@Nullable private final String hintId;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/TypedTuple.java b/api/applib/src/main/java/org/apache/isis/applib/value/TypedTuple.java
deleted file mode 100644
index c642c93..0000000
--- a/api/applib/src/main/java/org/apache/isis/applib/value/TypedTuple.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.isis.applib.value;
-
-import org.apache.isis.core.commons.collections.Can;
-
-public interface TypedTuple {
-
- Can<Class<?>> getTypes();
- Can<Can<?>> getValues();
-
-}