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 2017/03/24 10:06:05 UTC
[01/17] isis git commit: Update
_ugfun_how-tos_class-structure_properties.adoc
Repository: isis
Updated Branches:
refs/heads/master 6ed4f3b74 -> c22a39dcb
Update _ugfun_how-tos_class-structure_properties.adoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/caf4f74c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/caf4f74c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/caf4f74c
Branch: refs/heads/master
Commit: caf4f74c7281fda1918990af8d7d4c2a8a854172
Parents: 6c74c9b
Author: ppirus <pp...@users.noreply.github.com>
Authored: Tue Mar 21 22:26:34 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Tue Mar 21 22:26:34 2017 +0100
----------------------------------------------------------------------
.../asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/caf4f74c/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
index 008c4fa..646d733 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
@@ -8,7 +8,7 @@
A property is an instance variable of a domain object, of a scalar type, that holds some state about either a xref:ugfun.adoc#__ugfun_how-tos_class-structure_class-definition_entities[domain entity] or a xref:ugfun.adoc#__ugfun_how-tos_class-structure_class-definition_view-models[view model].
For example, a ``Customer``'s `firstName` would be a property, as would their `accountCreationDate` that they created their account.
-All properties have at least a "getter" method, and most properties have also a "setter" method (meaning that they are immutable).
+All properties have at least a "getter" method, and most properties have also a "setter" method (meaning that they are mutable).
Properties that do _not_ have a setter method are derived properties, and so are not persisted.
Formally speaking, a property is simply a regular JavaBean getter, returning a scalar value recognized by the framework.
[06/17] isis git commit: Merge branch 'patch-1' of
https://github.com/ppirus/isis into ISIS-1521_pr-72
Posted by da...@apache.org.
Merge branch 'patch-1' of https://github.com/ppirus/isis into ISIS-1521_pr-72
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/09469b4e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/09469b4e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/09469b4e
Branch: refs/heads/master
Commit: 09469b4e1293adaa8d8b3b8e2486a0c811200fc3
Parents: 6ed4f3b caf4f74
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:28:44 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:28:44 2017 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/17] isis git commit: Merge branch 'patch-5' of
https://github.com/ppirus/isis into ISIS-1521_pr-76
Posted by da...@apache.org.
Merge branch 'patch-5' of https://github.com/ppirus/isis into ISIS-1521_pr-76
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ee834ce7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ee834ce7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ee834ce7
Branch: refs/heads/master
Commit: ee834ce702bd91604268801f38ece952eeb96852
Parents: 2456853 90450f6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:31:32 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:31:32 2017 +0000
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_inject-services.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[10/17] isis git commit: Merge branch 'patch-3' of
https://github.com/ppirus/isis into ISIS-1521_pr-74
Posted by da...@apache.org.
Merge branch 'patch-3' of https://github.com/ppirus/isis into ISIS-1521_pr-74
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6dfa7ed1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6dfa7ed1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6dfa7ed1
Branch: refs/heads/master
Commit: 6dfa7ed1a3877af74d879c96f263a8bb21596257
Parents: 0db5436 9155d0e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:29:31 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:29:31 2017 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/17] isis git commit: ISIS-1521: reverts just one of the mods made
in PR #76
Posted by da...@apache.org.
ISIS-1521: reverts just one of the mods made in PR #76
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2baddd7e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2baddd7e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2baddd7e
Branch: refs/heads/master
Commit: 2baddd7ede957b345eec8d24b521012b6249b2f9
Parents: 40dce3f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:33:20 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:33:20 2017 +0000
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_inject-services.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2baddd7e/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
index 332c406..0e09781 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
@@ -58,7 +58,7 @@ We recommend using default rather than `private` visibility so that the field ca
== Method Injection
The framework also supports two forms of method injection.
-All that is required to inject a service into a entity/service is to provide an appropriate method and field.
+All that is required to inject a service into a entity/service is to provide an appropriate method or field.
The name of the method does not matter, only that it is prefixed either `set` or `inject`, is public, and has a single parameter of the correct type.
For example:
[03/17] isis git commit: Update
_ugfun_how-tos_class-structure_collections.adoc
Posted by da...@apache.org.
Update _ugfun_how-tos_class-structure_collections.adoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9155d0e9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9155d0e9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9155d0e9
Branch: refs/heads/master
Commit: 9155d0e926743368eb645a3558045e394e9fdc95
Parents: 6c74c9b
Author: ppirus <pp...@users.noreply.github.com>
Authored: Wed Mar 22 00:04:49 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Wed Mar 22 00:04:49 2017 +0100
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_collections.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9155d0e9/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
index b1b69ec..fe7cfdf 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
@@ -27,7 +27,7 @@ Apache Isis recognises some of these annotations for JDO/DataNucleus and JAXB an
Unlike xref:ugfun.adoc#_ugfun_how-tos_class-structure_properties[properties], the framework (at least, the xref:ugvw.adoc[Wicket viewer]) does not allow collections to be "edited".
Instead, xref:ugfun.adoc#_ugfun_how-tos_class-structure_actions[action]s can be written that will modify the contents of the collection as a side-effect.
-For example, a `placeOrder(...)` action will likely add to an `Order` to the `Customer#orders` collection.
+For example, a `placeOrder(...)` action will likely add an `Order` to the `Customer#orders` collection.
Since writing getter and setter methods adds quite a bit of boilerplate, it's common to use link:https://projectlombok.org/[Project Lombok] to code generate these methods at compile time (using Java's annotation processor) simply by adding the `@lombok.Getter` and `@lombok.Setter` annotations to the field.
[11/17] isis git commit: Merge branch 'ISIS-1521_pr-74'
Posted by da...@apache.org.
Merge branch 'ISIS-1521_pr-74'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2400b2ed
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2400b2ed
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2400b2ed
Branch: refs/heads/master
Commit: 2400b2ed369f70041adf9d4cbc01a8d358832c64
Parents: 0db5436 6dfa7ed
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:29:40 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:29:40 2017 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/17] isis git commit: Merge branch 'ISIS-1521_pr-72'
Posted by da...@apache.org.
Merge branch 'ISIS-1521_pr-72'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/40e914a4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/40e914a4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/40e914a4
Branch: refs/heads/master
Commit: 40e914a455c244557fa3993d389d0c22f1ec8545
Parents: 6ed4f3b 09469b4
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:28:52 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:28:52 2017 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[17/17] isis git commit: ISIS-1521: specify diagram names for
asciidoc syntax examples
Posted by da...@apache.org.
ISIS-1521: specify diagram names for asciidoc syntax examples
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c22a39dc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c22a39dc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c22a39dc
Branch: refs/heads/master
Commit: c22a39dcb77bdab5bfa4c7292030f67bc4fd4f27
Parents: 2baddd7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 09:19:13 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 09:19:13 2017 +0000
----------------------------------------------------------------------
.../src/main/asciidoc/guides/_dg_asciidoc-syntax.adoc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c22a39dc/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-syntax.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-syntax.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-syntax.adoc
index e113c5f..9927552 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-syntax.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-syntax.adoc
@@ -865,7 +865,7 @@ Asciidoctor includes support for the link:http://plantuml.com/[plantuml], allowi
For example:
....
-[plantuml,_images/mydiagram,png]
+[plantuml,_images/plantuml-demo,png]
--
class Car
@@ -877,7 +877,7 @@ Car -- Person : < owns
renders as:
-[plantuml,_images/mydiagram,png]
+[plantuml,_images/plantuml-demo,png]
--
class Car
@@ -897,7 +897,7 @@ Asciidoctor includes support for the link:http://ditaa.sourceforge.net/[ditaa],
For example:
....
-[ditaa]
+[ditaa,_images/ditaa-demo,png]
----
+--------+ +-------+ +-------+
| | --+ ditaa +--> | |
@@ -913,7 +913,7 @@ For example:
renders as:
-[ditaa]
+[ditaa,_images/ditaa-demo,png]
----
+--------+ +-------+ +-------+
| | --+ ditaa +--> | |
@@ -936,7 +936,7 @@ Asciidoctor includes support for the link:http://ditaa.sourceforge.net/[ditaa],
For example:
....
-[graphviz]
+[graphviz,_images/graphviz-demo,png]
----
digraph automata_0 {
size ="8.5, 11";
@@ -956,7 +956,7 @@ digraph automata_0 {
renders as:
-[graphviz]
+[graphviz,_images/graphviz-demo,png]
----
digraph automata_0 {
size ="8.5, 11";
[09/17] isis git commit: Merge branch 'ISIS-1521_pr-73'
Posted by da...@apache.org.
Merge branch 'ISIS-1521_pr-73'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0db54361
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0db54361
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0db54361
Branch: refs/heads/master
Commit: 0db54361915ce8250125ac50b214a6d8a0b9d1f7
Parents: 40e914a b56ddfe
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:29:20 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:29:20 2017 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/17] isis git commit: Update
_ugfun_how-tos_class-structure_actions.adoc
Posted by da...@apache.org.
Update _ugfun_how-tos_class-structure_actions.adoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/aa5c9422
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/aa5c9422
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/aa5c9422
Branch: refs/heads/master
Commit: aa5c94228c40cf7f7c72c7065398022976e6e81f
Parents: 6c74c9b
Author: ppirus <pp...@users.noreply.github.com>
Authored: Wed Mar 22 12:36:35 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Wed Mar 22 12:36:35 2017 +0100
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_actions.adoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/aa5c9422/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
index b32f75f..20d85b2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
@@ -11,9 +11,9 @@ While xref:ugfun.adoc#_ugfun_how-tos_class-structure_properties[properties] and
An application whose domain objects have only/mostly "know-what" responsibilities is pretty dumb: it requires that the end-user know the business rules and doesn't modify the state of the domain objects such that they are invalid (for example, an "end date" being before a "start date").
Such applications are often called CRUD applications (create/read/update/delete).
-In more complex domains, it's not realistic/feasible to expect the end-user to have to remember all the different business rules that govern the valid states for each domain objects.
+In more complex domains, it's not realistic/feasible to expect the end-user to have to remember all the different business rules that govern the valid states for each domain object.
So instead actions allow those business rules to be encoded programmatically.
-An Apache Isis doesn't try to constrain the end-user as to way in which they interact with the user (it doesn't attempt to define a rigid business process) but it does aim to ensure that business rule invariants are maintained, that is that business objects aren't allowed to go into an invalid state.
+An Apache Isis application doesn't try to constrain the end-user as to way in which they interact with the user (it doesn't attempt to define a rigid business process) but it does aim to ensure that business rule invariants are maintained, that is that business objects aren't allowed to go into an invalid state.
For simple domain applications, you may want to start prototyping only with properties, and only later introduce actions (representing the most common business operations).
But an alternative approach, recommended for more complex applications, is actually to start the application with all properties non-editable.
@@ -114,7 +114,7 @@ public class Product ... {
(As noted above), if the number of available instances of the reference type is a small number (in other words, all of which could comfortably be shown in a drop-down) then instead the `choicesNXxx()` supporting method can be used.
This too can be avoided by annotating the referenced class.
-For example, support we have an action to specify the `PaymentMethodType`, where there only 10 or so such (Visa, Mastercard, Amex, Paypal etc).
+For example, suppose we have an action to specify the `PaymentMethodType`, where there are only 10 or so such (Visa, Mastercard, Amex, Paypal etc).
We could define this as:
[source,java]
@@ -227,7 +227,7 @@ public Customer updateName(
[IMPORTANT]
====
-Incidentally, note in the above example that the new value is assigned to the properties using the setter methods; the action does not simply use set the instance field directly.
+Incidentally, note in the above example that the new value is assigned to the properties using the setter methods; the action does not simply set the instance field directly.
This is important, because it allows JDO/DataNucleus to keep track that this instance variable is "dirty" and so needs flushing to the database table before the transaction completes.
====
[08/17] isis git commit: Merge branch 'patch-2' of
https://github.com/ppirus/isis into ISIS-1521_pr-73
Posted by da...@apache.org.
Merge branch 'patch-2' of https://github.com/ppirus/isis into ISIS-1521_pr-73
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b56ddfe8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b56ddfe8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b56ddfe8
Branch: refs/heads/master
Commit: b56ddfe874496a26e2ecb13c6b6378646f3f3838
Parents: 40e914a 58aa344
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:29:15 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:29:15 2017 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/17] isis git commit: Merge branch 'patch-4' of
https://github.com/ppirus/isis into ISIS-1521_pr-75
Posted by da...@apache.org.
Merge branch 'patch-4' of https://github.com/ppirus/isis into ISIS-1521_pr-75
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3efdf423
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3efdf423
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3efdf423
Branch: refs/heads/master
Commit: 3efdf423fffdeab3709926b08aee8aa74ed47fe3
Parents: 2400b2e aa5c942
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:30:28 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:30:28 2017 +0000
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_actions.adoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[02/17] isis git commit: Update
_ugfun_how-tos_class-structure_properties.adoc
Posted by da...@apache.org.
Update _ugfun_how-tos_class-structure_properties.adoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/58aa3445
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/58aa3445
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/58aa3445
Branch: refs/heads/master
Commit: 58aa34450819b85e4ed4fa3fabd6d6dffd81fad0
Parents: 6c74c9b
Author: ppirus <pp...@users.noreply.github.com>
Authored: Tue Mar 21 23:05:25 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Tue Mar 21 23:05:25 2017 +0100
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_properties.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/58aa3445/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
index 008c4fa..956f387 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
@@ -33,7 +33,7 @@ The xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp
[[__ugfun_how-tos_class-structure_properties_value-vs-reference-types]]
== Value vs Reference Types
-Properties can be either a value types (strings, int, date and so on) or be a reference to another object (for example, an `Order` referencing the `Customer` that placed it).
+Properties can be either a value type (strings, int, date and so on) or be a reference to another object (for example, an `Order` referencing the `Customer` that placed it).
For example, to map a string value type:
@@ -53,7 +53,7 @@ You could also add the `@Property` annotation if you wished:
private String notes;
----
-Although in this case it is not required in this case (none of its attributes have been set).
+Although in this case it is not required (none of its attributes have been set).
Or to map a reference type:
@@ -367,7 +367,7 @@ whereby a single table corresponds to the superclass, and also holds the propert
* "table per class" (`InheritanceStrategy.NEW_TABLE`) +
+
-whereby is a table for both superclass and subclass, in 1:1 correspondence
+whereby there is a table for both superclass and subclass, in 1:1 correspondence
* "rolldown" (`InheritanceStrategy.SUBCLASS_TABLE`) +
+
[13/17] isis git commit: Merge branch 'ISIS-1521_pr-75'
Posted by da...@apache.org.
Merge branch 'ISIS-1521_pr-75'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/24568538
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/24568538
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/24568538
Branch: refs/heads/master
Commit: 24568538b11e84963bbcc27db6fdd067410b2be1
Parents: 2400b2e 3efdf42
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:30:30 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:30:30 2017 +0000
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_actions.adoc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[05/17] isis git commit: Update
_ugfun_how-tos_class-structure_inject-services.adoc
Posted by da...@apache.org.
Update _ugfun_how-tos_class-structure_inject-services.adoc
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/90450f67
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/90450f67
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/90450f67
Branch: refs/heads/master
Commit: 90450f67cffd75023f53cccd6ec999f653fe76ff
Parents: 6c74c9b
Author: ppirus <pp...@users.noreply.github.com>
Authored: Wed Mar 22 15:44:55 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Wed Mar 22 15:44:55 2017 +0100
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_inject-services.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/90450f67/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
index 61463c2..332c406 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_inject-services.adoc
@@ -13,7 +13,7 @@ This is common for example for SPI service, whereby one module defines an SPI se
To support this, the framework also allows lists of services to be injected.
When there are multiple service implementations of a given type, the framework will inject the service with highest priority, as defined through xref:rgant.adoc#_rgant_DomainService_menuOrder[`@DomainService#menuOrder()`] (even for domain services that are not menus), lowest first.
-If a list of services are injected, then that list will be ordered according to `menuOrder`, again lowest first.
+If a list of services is injected, then that list will be ordered according to `menuOrder`, again lowest first.
@@ -58,7 +58,7 @@ We recommend using default rather than `private` visibility so that the field ca
== Method Injection
The framework also supports two forms of method injection.
-All that is required to inject a service into a entity/service is to provide an appropriate method or field.
+All that is required to inject a service into a entity/service is to provide an appropriate method and field.
The name of the method does not matter, only that it is prefixed either `set` or `inject`, is public, and has a single parameter of the correct type.
For example:
[15/17] isis git commit: Merge branch 'ISIS-1521_pr-76'
Posted by da...@apache.org.
Merge branch 'ISIS-1521_pr-76'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/40dce3ff
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/40dce3ff
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/40dce3ff
Branch: refs/heads/master
Commit: 40dce3ff76bd43ce77c5a7cf2ebf2c44797a99d5
Parents: 2456853 ee834ce
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 24 08:31:35 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 24 08:31:35 2017 +0000
----------------------------------------------------------------------
.../guides/_ugfun_how-tos_class-structure_inject-services.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------