[isis] branch master updated: ISIS-2469: docs: update view-models (user guid)

[ah...@apache.org]

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 75cb56a  ISIS-2469: docs: update view-models (user guid)
75cb56a is described below

commit 75cb56ad32ec551d9c8a351e3a4bb2e8b1cfa0e5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 27 13:45:17 2020 +0100

    ISIS-2469: docs: update view-models (user guid)
---
 api/adoc/userguide/modules/fun/pages/view-models.adoc | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/api/adoc/userguide/modules/fun/pages/view-models.adoc b/api/adoc/userguide/modules/fun/pages/view-models.adoc
index 8eae547..a5130ba 100644
--- a/api/adoc/userguide/modules/fun/pages/view-models.adoc
+++ b/api/adoc/userguide/modules/fun/pages/view-models.adoc
@@ -233,7 +233,8 @@ They are:
 
 
 | External entity
-|[source,java]
+| WARNING: TODO EXTERNAL_ENTITY was removed, this use-case is still valid for consideration, what to do?
+[source,java]
 ----
 @DomainObject(nature=EXTERNAL_ENTITY)
 public class CustomerRecordOnSAP {
@@ -243,7 +244,8 @@ public class CustomerRecordOnSAP {
 |Annotated with xref:refguide:applib-ant:DomainObject.adoc#nature[`@DomainObject#nature`] and a nature of `EXTERNAL_ENTITY`, with memento derived automatically from the properties of the domain object.  Collections are ignored, as are any properties annotated as xref:refguide:applib-ant:Property.adoc#mementoSerialization[memento serialization].
 
 | In-memory entity
-|[source,java]
+| WARNING: TODO INMEMORY_ENTITY was removed, this use-case is still valid for consideration, what to do?
+[source,java]
 ----
 @DomainObject(nature=INMEMORY_ENTITY)
 public class Log4JAppender {
@@ -266,18 +268,6 @@ public class Dashboard {
 |
 [source,java]
 ----
-@ViewModel
-public class Dashboard {
-    // ...
-}
-----
-
-|Annotated with xref:refguide:applib-ant:ViewModel.adoc[`@ViewModel`] annotation (effectively just an alias)' memento is as preceding: from "persisted" properties, collections ignored
-
-|Application view model
-|
-[source,java]
-----
 public class ExcelUploadManager implements ViewModel {
   public String viewModelMemento() {
     // ...