This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-2485 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 67c3ea79a0a8b5cef3a6c0d8219dd8ec76616cf8 Author: danhaywood <[email protected]> AuthorDate: Fri May 5 07:32:27 2023 +0100 CAUSEWAY-2485: wip on composite value type example --- .../src/main/java/demoapp/dom/DemoModuleJpa.java | 2 +- .../assoc/AssociatedActionDemo-description.adoc | 0 .../progmodel}/assoc/AssociatedActionDemo.java | 2 +- .../assoc/AssociatedActionDemo.layout.xml | 0 .../progmodel}/assoc/AssociatedActionMenu.java | 2 +- .../progmodel}/assoc/DemoItem.java | 2 +- .../progmodel}/depargs/DemoItem.java | 2 +- .../DependentArgsActionDemo-description.adoc | 0 .../depargs/DependentArgsActionDemo.java | 2 +- .../depargs/DependentArgsActionDemo.layout.xml | 0 .../DependentArgsActionDemo_bulkAction.java | 2 +- .../DependentArgsActionDemo_useAutoComplete.java | 2 +- .../DependentArgsActionDemo_useAutoComplete2.java | 2 +- .../DependentArgsActionDemo_useChoices.java | 2 +- .../DependentArgsActionDemo_useChoices2.java | 2 +- .../DependentArgsActionDemo_useDefault.java | 2 +- .../DependentArgsActionDemo_useDisable.java | 2 +- .../depargs/DependentArgsActionDemo_useHide.java | 2 +- .../DependentArgsActionDemo_useIndependent.java | 2 +- .../depargs/DependentArgsActionMenu.java | 2 +- .../progmodel}/depargs/Parity.java | 2 +- .../DomainObjectLayoutTableDecorator.layout.xml | 3 +- .../progmodel/compositevalues/ComplexNumber.java} | 23 +++-- .../ComplexNumberValueSemantics.java} | 33 ++++--- .../compositevalues/ComplexNumber_default.java} | 14 +-- .../compositevalues/CompositeValueTypeMenu.java} | 17 ++-- .../CompositeValueTypePage-description.adoc} | 12 ++- .../compositevalues/CompositeValueTypePage.java} | 33 ++++--- .../CompositeValueTypePage.layout.xml} | 13 ++- .../CompositeValueTypePage_addComplexNumber.java | 41 ++++++++ ...mpositeValueTypePage_subtractComplexNumber.java | 41 ++++++++ .../progmodel/embeddedvalues}/ComplexNumber.java | 2 +- .../embeddedvalues}/ComplexNumberSamples.java | 2 +- .../embeddedvalues}/NumberConstantEntity.java | 2 +- .../embeddedvalues}/NumberConstantSeeding.java | 2 +- .../embeddedvalues}/jdo/ComplexNumberJdo.java | 4 +- .../jdo/ComplexNumberJdoValueSemantics.java | 2 +- .../embeddedvalues}/jdo/EmbeddedTypeMenuJdo.java | 2 +- .../jdo/EmbeddedTypePageJdo-description.adoc | 0 .../embeddedvalues}/jdo/EmbeddedTypePageJdo.java | 6 +- .../jdo/EmbeddedTypePageJdo.layout.xml | 9 +- .../jdo/NumberConstantJdo-description.adoc | 0 .../embeddedvalues}/jdo/NumberConstantJdo.java | 6 +- .../jdo/NumberConstantJdo.layout.xml | 0 .../embeddedvalues}/jdo/NumberConstantJdo.svg | 0 .../jdo/NumberConstantJdoRepository.java | 4 +- .../jdo/NumberConstantJdo_updateNumber.java | 2 +- .../embeddedvalues}/jpa/ComplexNumberJpa.java | 11 +-- .../jpa/ComplexNumberJpaValueSemantics.java | 2 +- .../jpa/ComplexNumberJpa_default.java | 2 +- .../embeddedvalues}/jpa/EmbeddedTypeMenuJpa.java | 4 +- .../jpa/EmbeddedTypePageJpa-description.adoc | 0 .../embeddedvalues}/jpa/EmbeddedTypePageJpa.java | 6 +- .../jpa/EmbeddedTypePageJpa.layout.xml | 9 +- .../jpa/NumberConstantJpa-description.adoc | 0 .../embeddedvalues}/jpa/NumberConstantJpa.java | 6 +- .../jpa/NumberConstantJpa.layout.xml | 0 .../embeddedvalues}/jpa/NumberConstantJpa.svg | 0 .../jpa/NumberConstantJpaRepository.java | 4 +- .../jpa/NumberConstantJpa_updateNumber.java | 2 +- .../progmodel}/mixins/CountHolder.java | 2 +- .../progmodel}/mixins/CountHolder_explanation.java | 2 +- .../mixins/CountHolder_fibonacciSequence.java | 2 +- .../progmodel}/mixins/CountHolder_updateCount.java | 2 +- .../mixins/FibonacciNumberVm-description.adoc | 0 .../progmodel}/mixins/FibonacciNumberVm.java | 8 +- .../progmodel/mixins/FibonacciNumberVm.layout.xml | 104 +++++++++++++++++++++ .../progmodel}/mixins/MixinMenu.java | 2 +- .../progmodel}/mixins/MixinPage-description.adoc | 0 .../progmodel}/mixins/MixinPage.java | 2 +- .../progmodel}/mixins/MixinPage.layout.xml | 0 .../mixins/mixins/FibonacciNumberVm.layout.xml | 79 ---------------- .../java/demoapp/dom/featured/FeaturedMenu.java | 2 +- .../featured/layout/describedAs/DescribedAsVm.java | 2 +- .../src/main/java/demoapp/dom/menubars.layout.xml | 1 + .../customvaluetypes/ComplexNumberJdo_Test.java | 2 +- 76 files changed, 347 insertions(+), 216 deletions(-) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java index b34f301d87..646c5c23f5 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java @@ -50,7 +50,7 @@ import demoapp.dom.domain.objects.DomainObjectLayout.named.jpa.DomainObjectLayou import demoapp.dom.domain.objects.DomainObjectLayout.paged.jpa.DomainObjectLayoutPagedJpa; import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.jpa.DomainObjectLayoutTableDecoratorJpa; import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.jpa.DomainObjectLayoutXxxUiEventJpa; -import demoapp.dom.domain.progmodel.objects.embedded.jpa.NumberConstantJpa; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa.NumberConstantJpa; import demoapp.dom.domain.properties.Property.commandPublishing.jpa.PropertyCommandPublishingJpa; import demoapp.dom.domain.properties.Property.editing.jpa.PropertyEditingJpa; import demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingJpa; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java index 66faa84292..2af1993470 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.assoc.assoc; +package demoapp.dom.domain.actions.progmodel.assoc; import java.util.LinkedHashSet; import java.util.Set; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionMenu.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionMenu.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionMenu.java index 45d64ffa4e..f1ae018bc9 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.assoc.assoc; +package demoapp.dom.domain.actions.progmodel.assoc; import javax.inject.Inject; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java similarity index 96% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java copy to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java index 4278a53207..9f87b0174c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.assoc.assoc; +package demoapp.dom.domain.actions.progmodel.assoc; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DemoItem.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java index 58c63993b4..7a6ed67c72 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DemoItem.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java index 7792116c54..0208c606f4 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import java.util.LinkedHashSet; import java.util.Set; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_bulkAction.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_bulkAction.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java index dc2d238a9b..5b26619d3d 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_bulkAction.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import java.util.Collection; import java.util.Set; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java index 39252af9e9..34c76236ed 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import java.util.Collection; import java.util.stream.Collectors; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete2.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete2.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java index 3ac5a17e40..97f9681954 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete2.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import java.util.Collections; import java.util.List; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java index f88093dc8f..7a8e62549c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import java.util.Collection; import java.util.stream.Collectors; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices2.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices2.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java index f5691ce2da..fe451bbe11 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices2.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import java.util.Collections; import java.util.List; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDefault.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDefault.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDefault.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDefault.java index 203cac968c..68c781e8d7 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDefault.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDefault.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDisable.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDisable.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDisable.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDisable.java index 9495268906..63a6ac6abf 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDisable.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDisable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useHide.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useHide.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useHide.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useHide.java index 3c939a121c..d0cad0b38e 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useHide.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useHide.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useIndependent.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useIndependent.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useIndependent.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useIndependent.java index b547e23f09..64c22b6317 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useIndependent.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useIndependent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import java.util.Collection; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionMenu.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionMenu.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionMenu.java index 488731d801..4a8b96da25 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import javax.inject.Inject; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java similarity index 94% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java copy to examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java index da031acf76..505e59f229 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.actions.progmodel.depargs; import org.apache.causeway.applib.annotation.ObjectSupport; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecorator.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecorator.layout.xml index 1135efb565..400651cec3 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecorator.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/tabledec/DomainObjectLayoutTableDecorator.layout.xml @@ -71,7 +71,8 @@ <cpt:action id="openRestApi" position="PANEL_DROPDOWN" /> <cpt:property id="description"/> </cpt:fieldSet> - </bs3:col> </bs3:row> + </bs3:col> + </bs3:row> <bs3:row> <bs3:col span="12" unreferencedCollections="true"/> </bs3:row> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumber.java similarity index 60% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumber.java index da031acf76..9d2595f1b0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumber.java @@ -16,16 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.depargs.depargs; +package demoapp.dom.domain.objects.progmodel.compositevalues; -import org.apache.causeway.applib.annotation.ObjectSupport; -public enum Parity { - EVEN, - ODD; +// tag::class[] [email protected] // <.> [email protected] // <.> [email protected](staticName = "of") +public class ComplexNumber { - @ObjectSupport public String title() { - return name(); + double re; + double im; + + public ComplexNumber add(ComplexNumber other) { + return ComplexNumber.of(re + other.re, im + other.im); + } + + public ComplexNumber subtract(ComplexNumber other) { + return ComplexNumber.of(re - other.re, im - other.im); } } +// end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpaValueSemantics.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumberValueSemantics.java similarity index 74% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpaValueSemantics.java copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumberValueSemantics.java index 465149cd5c..9834e113c5 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpaValueSemantics.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumberValueSemantics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.compositevalues; import javax.inject.Named; @@ -31,20 +31,19 @@ import org.apache.causeway.applib.value.semantics.ValueDecomposition; import org.apache.causeway.applib.value.semantics.ValueSemanticsAbstract; import org.apache.causeway.schema.common.v2.ValueType; -@Profile("demo-jpa") // tag::class[] -@Named("demo.ComplexNumberJpaValueSemantics") +@Named("demo.ComplexNumberValueSemantics") @Component @Import({ - ComplexNumberJpa_default.class // <.> + ComplexNumber_default.class // <.> }) -public class ComplexNumberJpaValueSemantics - extends ValueSemanticsAbstract<ComplexNumberJpa> { +public class ComplexNumberValueSemantics + extends ValueSemanticsAbstract<ComplexNumber> { // end::class[] @Override - public Class<ComplexNumberJpa> getCorrespondingClass() { - return ComplexNumberJpa.class; + public Class<ComplexNumber> getCorrespondingClass() { + return ComplexNumber.class; } @Override @@ -54,25 +53,25 @@ public class ComplexNumberJpaValueSemantics // tag::getDefaultsProvider[] @Override - public DefaultsProvider<ComplexNumberJpa> getDefaultsProvider() { - return ()-> ComplexNumberJpa.of(0, 0); + public DefaultsProvider<ComplexNumber> getDefaultsProvider() { + return ()-> ComplexNumber.of(0, 0); } // end::getDefaultsProvider[] // tag::compose[] @Override - public ValueDecomposition decompose(final ComplexNumberJpa value) { + public ValueDecomposition decompose(final ComplexNumber value) { return CommonDtoUtils.typedTupleBuilder(value) - .addFundamentalType(ValueType.DOUBLE, "re", ComplexNumberJpa::getRe) - .addFundamentalType(ValueType.DOUBLE, "im", ComplexNumberJpa::getIm) + .addFundamentalType(ValueType.DOUBLE, "re", ComplexNumber::getRe) + .addFundamentalType(ValueType.DOUBLE, "im", ComplexNumber::getIm) .buildAsDecomposition(); } @Override - public ComplexNumberJpa compose(final ValueDecomposition decomposition) { + public ComplexNumber compose(final ValueDecomposition decomposition) { return decomposition.right() .map(CommonDtoUtils::typedTupleAsMap) - .map(map->ComplexNumberJpa.of( + .map(map-> ComplexNumber.of( (Double)map.get("re"), (Double)map.get("im"))) .orElse(null); @@ -81,11 +80,11 @@ public class ComplexNumberJpaValueSemantics // tag::getRenderer[] @Override - public Renderer<ComplexNumberJpa> getRenderer() { + public Renderer<ComplexNumber> getRenderer() { return (context, object) -> title(object, "NaN"); } - private static String title(ComplexNumberJpa complexNumber, final String fallbackIfNull) { + private static String title(ComplexNumber complexNumber, final String fallbackIfNull) { if (complexNumber == null) return fallbackIfNull; return complexNumber.getRe() + (complexNumber.getIm() >= 0 diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa_default.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumber_default.java similarity index 77% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa_default.java copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumber_default.java index ed642ebb77..7b53093be3 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa_default.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/ComplexNumber_default.java @@ -1,6 +1,4 @@ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; - -import lombok.RequiredArgsConstructor; +package demoapp.dom.domain.objects.progmodel.compositevalues; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; @@ -8,21 +6,23 @@ import org.apache.causeway.applib.annotation.MemberSupport; import org.apache.causeway.applib.annotation.PromptStyle; import org.apache.causeway.applib.annotation.SemanticsOf; +import lombok.RequiredArgsConstructor; + // tag::default-mixin[] // ... @Action(semantics = SemanticsOf.SAFE) @ActionLayout(promptStyle = PromptStyle.INLINE_AS_IF_EDIT) @RequiredArgsConstructor -public class ComplexNumberJpa_default { +public class ComplexNumber_default { - private final ComplexNumberJpa mixee; + private final ComplexNumber mixee; @MemberSupport - public ComplexNumberJpa act( + public ComplexNumber act( final double re, final double im ) { - return ComplexNumberJpa.of(re, im); + return ComplexNumber.of(re, im); } @MemberSupport diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypeMenuJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypeMenu.java similarity index 76% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypeMenuJdo.java copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypeMenu.java index c67f92041c..5a14672454 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypeMenuJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypeMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.compositevalues; import javax.inject.Inject; import javax.inject.Named; @@ -28,22 +28,21 @@ import org.apache.causeway.applib.annotation.NatureOfService; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.factory.FactoryService; -import org.springframework.context.annotation.Profile; - import lombok.RequiredArgsConstructor; -@Profile("demo-jdo") -@Named("demo.EmbeddedTypeMenuJdo") +@Named("demo.CompositeValueTypeMenu") @DomainService(nature=NatureOfService.VIEW) @javax.annotation.Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) -public class EmbeddedTypeMenuJdo { +public class CompositeValueTypeMenu { private final FactoryService factoryService; @Action - @ActionLayout(cssClassFa="fa-stop-circle", describedAs = "Experimental support for embedded types") - public EmbeddedTypePageJdo embeddedTypes(){ - return factoryService.viewModel(new EmbeddedTypePageJdo()); + @ActionLayout(cssClassFa="fa-cubes", describedAs = "Custom composite value types") + public CompositeValueTypePage compositeValueTypes(){ + CompositeValueTypePage page = factoryService.viewModel(new CompositeValueTypePage()); + page.setComplexNumber(ComplexNumber.of(1, 0)); + return page; } } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage-description.adoc similarity index 83% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm-description.adoc copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage-description.adoc index 1ae5a3bf00..5e068526a2 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage-description.adoc @@ -1,6 +1,14 @@ :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...] -This demo object represents the result of N! +TODO -Instances of this type are returned from the `fibonacciSequence` collection contributed to ``CountHolder``s. +== How this demo works + +TODO + +[source,java] +.NumberConstantJpa.java +---- +include::ComplexNumber.java[tags=class] +---- diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage.java similarity index 71% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage.java index 4278a53207..a1ea560684 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage.java @@ -16,34 +16,37 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.actions.assoc.assoc; +package demoapp.dom.domain.objects.progmodel.compositevalues; + +import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; + +import lombok.Getter; +import lombok.Setter; import javax.inject.Named; import org.apache.causeway.applib.annotation.DomainObject; -import org.apache.causeway.applib.annotation.Editing; import org.apache.causeway.applib.annotation.Nature; import org.apache.causeway.applib.annotation.ObjectSupport; import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.PropertyLayout; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Named("demo.AssociatedActionDemoTask") +// tag::class[] +@Named("demo.CompositeValuesPage") @DomainObject(nature=Nature.VIEW_MODEL) -@NoArgsConstructor -@AllArgsConstructor(staticName="of") -public class DemoItem { +public class CompositeValueTypePage implements HasAsciiDocDescription { + // ... +// end::class[] @ObjectSupport public String title() { - return String.format("DemoItem '%s'", getName()); + return "Composite Value Types"; } - @Property(editing = Editing.DISABLED) - @PropertyLayout(describedAs="The name of this 'DemoItem'.") - @Getter @Setter private String name; + @Property + @Getter @Setter + private ComplexNumber complexNumber; + +// tag::class[] } +// end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage.layout.xml similarity index 81% copy from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.layout.xml copy to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage.layout.xml index 893f095846..757de5b3dc 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage.layout.xml @@ -26,7 +26,9 @@ <bs3:col span="6"> <bs3:row> <bs3:col span="12"> - <cpt:collection id="allConstants"/> + <cpt:fieldSet name="General" id="general"> + <cpt:property id="complexNumber"/> + </cpt:fieldSet> </bs3:col> </bs3:row> <bs3:row> @@ -38,12 +40,15 @@ <bs3:col span="6"> <cpt:fieldSet name="Description" id="description"> <cpt:action id="clearHints" position="PANEL" /> - <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/> <cpt:action id="rebuildMetamodel" position="PANEL"/> + <cpt:action id="downloadLayout" position="PANEL_DROPDOWN"/> + <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/> - <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> + <cpt:action id="downloadJdoMetamodel" position="PANEL_DROPDOWN"/> <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/> - <cpt:action id="downloadJdoMetadata" position="PANEL_DROPDOWN"/> + <cpt:action id="recentExecutions" position="PANEL_DROPDOWN"/> + <cpt:action id="recentAuditTrailEntries" position="PANEL_DROPDOWN"/> + <cpt:action id="impersonateWithRoles" position="PANEL_DROPDOWN"/> <cpt:action id="openRestApi" position="PANEL_DROPDOWN" /> <cpt:property id="description"/> </cpt:fieldSet> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage_addComplexNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage_addComplexNumber.java new file mode 100644 index 0000000000..3aa17a501f --- /dev/null +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage_addComplexNumber.java @@ -0,0 +1,41 @@ +package demoapp.dom.domain.objects.progmodel.compositevalues; + +import lombok.RequiredArgsConstructor; + +import org.apache.causeway.applib.annotation.*; + +// tag::default-mixin[] +// ... +@Action(semantics = SemanticsOf.NON_IDEMPOTENT) +@ActionLayout( + associateWith = "complexNumber", + promptStyle = PromptStyle.DIALOG_SIDEBAR +) +@RequiredArgsConstructor +public class CompositeValueTypePage_addComplexNumber { + + private final CompositeValueTypePage mixee; + + @MemberSupport + public CompositeValueTypePage act( + final ComplexNumber current, + final ComplexNumber other + ) { + mixee.setComplexNumber(current.add(other)); // <.> + return mixee; + } + + @MemberSupport public ComplexNumber defaultCurrent() { // <.> + return mixee.getComplexNumber(); + } + + @MemberSupport public String disableCurrent() { // <.> + return "Number being added to"; + } + + + @MemberSupport public ComplexNumber defaultOther() { + return ComplexNumber.of(0,0); + } + +} diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage_subtractComplexNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage_subtractComplexNumber.java new file mode 100644 index 0000000000..39a53e9945 --- /dev/null +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/compositevalues/CompositeValueTypePage_subtractComplexNumber.java @@ -0,0 +1,41 @@ +package demoapp.dom.domain.objects.progmodel.compositevalues; + +import lombok.RequiredArgsConstructor; + +import org.apache.causeway.applib.annotation.*; + +// tag::default-mixin[] +// ... +@Action(semantics = SemanticsOf.NON_IDEMPOTENT) +@ActionLayout( + associateWith = "complexNumber", + promptStyle = PromptStyle.DIALOG_SIDEBAR +) +@RequiredArgsConstructor +public class CompositeValueTypePage_subtractComplexNumber { + + private final CompositeValueTypePage mixee; + + @MemberSupport + public CompositeValueTypePage act( + final ComplexNumber current, + final ComplexNumber other + ) { + mixee.setComplexNumber(current.subtract(other)); + return mixee; + } + + @MemberSupport public ComplexNumber defaultCurrent() { + return mixee.getComplexNumber(); + } + + @MemberSupport public String disableCurrent() { + return "Number being added to"; + } + + + @MemberSupport public ComplexNumber defaultOther() { + return ComplexNumber.of(0,0); + } + +} diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/ComplexNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/ComplexNumber.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/ComplexNumber.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/ComplexNumber.java index 7c0e560c92..3f12f2f456 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/ComplexNumber.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/ComplexNumber.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded; +package demoapp.dom.domain.objects.progmodel.embeddedvalues; import lombok.Value; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/ComplexNumberSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/ComplexNumberSamples.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/ComplexNumberSamples.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/ComplexNumberSamples.java index 523764edd4..dcd9f310e4 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/ComplexNumberSamples.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/ComplexNumberSamples.java @@ -18,7 +18,7 @@ * */ -package demoapp.dom.domain.progmodel.objects.embedded; +package demoapp.dom.domain.objects.progmodel.embeddedvalues; import java.util.stream.Stream; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/NumberConstantEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/NumberConstantEntity.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/NumberConstantEntity.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/NumberConstantEntity.java index 6aab9924e2..fcdf5b8b0c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/NumberConstantEntity.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/NumberConstantEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded; +package demoapp.dom.domain.objects.progmodel.embeddedvalues; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/NumberConstantSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/NumberConstantSeeding.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/NumberConstantSeeding.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/NumberConstantSeeding.java index df29b39e9f..35d170afdf 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/NumberConstantSeeding.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/NumberConstantSeeding.java @@ -18,7 +18,7 @@ * */ -package demoapp.dom.domain.progmodel.objects.embedded; +package demoapp.dom.domain.objects.progmodel.embeddedvalues; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/ComplexNumberJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/ComplexNumberJdo.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/ComplexNumberJdo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/ComplexNumberJdo.java index 726254e70e..baf3aa7a6f 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/ComplexNumberJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/ComplexNumberJdo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo; import java.util.Optional; import java.util.regex.Matcher; @@ -28,7 +28,7 @@ import org.apache.causeway.applib.annotation.Value; import lombok.AccessLevel; import lombok.val; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; // tag::class[] @javax.jdo.annotations.PersistenceCapable // <.> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/ComplexNumberJdoValueSemantics.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/ComplexNumberJdoValueSemantics.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/ComplexNumberJdoValueSemantics.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/ComplexNumberJdoValueSemantics.java index 6974334a8b..0a5a93e652 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/ComplexNumberJdoValueSemantics.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/ComplexNumberJdoValueSemantics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo; import org.springframework.stereotype.Component; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypeMenuJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypeMenuJdo.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypeMenuJdo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypeMenuJdo.java index c67f92041c..8d2902d6a8 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypeMenuJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypeMenuJdo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo; import javax.inject.Inject; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo.java similarity index 89% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo.java index 30725b75fb..9e2d0b04df 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.causeway.applib.annotation.ObjectSupport; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; -import demoapp.dom.domain.progmodel.objects.embedded.NumberConstantEntity; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.NumberConstantEntity; // tag::class[] @Named("demo.EmbeddedTypePageJdo") diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo.layout.xml similarity index 87% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo.layout.xml index 893f095846..d65c225c18 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/EmbeddedTypePageJdo.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/EmbeddedTypePageJdo.layout.xml @@ -38,12 +38,15 @@ <bs3:col span="6"> <cpt:fieldSet name="Description" id="description"> <cpt:action id="clearHints" position="PANEL" /> - <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/> <cpt:action id="rebuildMetamodel" position="PANEL"/> - <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/> + <cpt:action id="downloadLayout" position="PANEL_DROPDOWN"/> <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> + <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/> + <cpt:action id="downloadJdoMetamodel" position="PANEL_DROPDOWN"/> <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/> - <cpt:action id="downloadJdoMetadata" position="PANEL_DROPDOWN"/> + <cpt:action id="recentExecutions" position="PANEL_DROPDOWN"/> + <cpt:action id="recentAuditTrailEntries" position="PANEL_DROPDOWN"/> + <cpt:action id="impersonateWithRoles" position="PANEL_DROPDOWN"/> <cpt:action id="openRestApi" position="PANEL_DROPDOWN" /> <cpt:property id="description"/> </cpt:fieldSet> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo.java similarity index 91% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo.java index 08532419ba..76da8529fc 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo; import javax.inject.Named; import javax.jdo.annotations.Column; @@ -36,8 +36,8 @@ import org.apache.causeway.applib.annotation.Property; import lombok.Getter; import lombok.Setter; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; -import demoapp.dom.domain.progmodel.objects.embedded.NumberConstantEntity; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.NumberConstantEntity; @Profile("demo-jdo") //tag::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo.svg b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo.svg similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo.svg rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo.svg diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdoRepository.java similarity index 92% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdoRepository.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdoRepository.java index ab8089bd9e..a4fd86eb29 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdoRepository.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdoRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import org.springframework.stereotype.Service; import lombok.val; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; @Profile("demo-jdo") @Service diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo_updateNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo_updateNumber.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo_updateNumber.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo_updateNumber.java index 3edf5a2ce1..88cd54f0ca 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jdo/NumberConstantJdo_updateNumber.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jdo/NumberConstantJdo_updateNumber.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jdo; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo; import org.springframework.context.annotation.Profile; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpa.java similarity index 82% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpa.java index 846a03d395..23628d1104 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpa.java @@ -16,20 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; -import java.util.Optional; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.causeway.applib.annotation.ObjectSupport; import org.apache.causeway.applib.annotation.Value; -import org.apache.causeway.applib.annotation.ValueSemantics; import lombok.AccessLevel; -import lombok.val; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; // tag::class[] @javax.persistence.Embeddable // <.> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpaValueSemantics.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpaValueSemantics.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpaValueSemantics.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpaValueSemantics.java index 465149cd5c..06ec2cbfbc 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpaValueSemantics.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpaValueSemantics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa_default.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpa_default.java similarity index 93% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa_default.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpa_default.java index ed642ebb77..5df1befb96 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/ComplexNumberJpa_default.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/ComplexNumberJpa_default.java @@ -1,4 +1,4 @@ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; import lombok.RequiredArgsConstructor; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypeMenuJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypeMenuJpa.java similarity index 93% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypeMenuJpa.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypeMenuJpa.java index 59204c5a16..93909953e0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypeMenuJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypeMenuJpa.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; import javax.inject.Inject; import javax.inject.Named; @@ -32,8 +32,6 @@ import org.apache.causeway.applib.services.factory.FactoryService; import lombok.RequiredArgsConstructor; -import demoapp.dom.domain.progmodel.objects.embedded.jdo.EmbeddedTypePageJdo; - @Profile("demo-jpa") @Named("demo.EmbeddedTypeMenuJpa") @DomainService(nature=NatureOfService.VIEW) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa.java similarity index 89% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa.java index 7b5d301e06..e275ae2c8e 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; -import demoapp.dom.domain.progmodel.objects.embedded.NumberConstantEntity; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.NumberConstantEntity; import java.util.List; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa.layout.xml similarity index 86% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa.layout.xml index 893f095846..7a08691979 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/EmbeddedTypePageJpa.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/EmbeddedTypePageJpa.layout.xml @@ -38,12 +38,15 @@ <bs3:col span="6"> <cpt:fieldSet name="Description" id="description"> <cpt:action id="clearHints" position="PANEL" /> - <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/> <cpt:action id="rebuildMetamodel" position="PANEL"/> + <cpt:action id="downloadLayout" position="PANEL_DROPDOWN"/> + <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/> - <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> + <cpt:action id="downloadJdoMetamodel" position="PANEL_DROPDOWN"/> <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/> - <cpt:action id="downloadJdoMetadata" position="PANEL_DROPDOWN"/> + <cpt:action id="recentExecutions" position="PANEL_DROPDOWN"/> + <cpt:action id="recentAuditTrailEntries" position="PANEL_DROPDOWN"/> + <cpt:action id="impersonateWithRoles" position="PANEL_DROPDOWN"/> <cpt:action id="openRestApi" position="PANEL_DROPDOWN" /> <cpt:property id="description"/> </cpt:fieldSet> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa.java similarity index 91% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa.java index 71e38545ee..54054882a9 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; import javax.inject.Named; import javax.persistence.Entity; @@ -37,8 +37,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; -import demoapp.dom.domain.progmodel.objects.embedded.NumberConstantEntity; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.NumberConstantEntity; @Profile("demo-jpa") //tag::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa.svg b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa.svg similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa.svg rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa.svg diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpaRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpaRepository.java similarity index 92% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpaRepository.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpaRepository.java index 182cd8fab5..df35057be2 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpaRepository.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpaRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; @@ -24,7 +24,7 @@ import org.springframework.stereotype.Service; import lombok.val; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.progmodel.objects.embedded.ComplexNumber; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.ComplexNumber; @Profile("demo-jpa") @Service diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa_updateNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa_updateNumber.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa_updateNumber.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa_updateNumber.java index e7e90b7604..6abcba8512 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/jpa/NumberConstantJpa_updateNumber.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/embeddedvalues/jpa/NumberConstantJpa_updateNumber.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.embedded.jpa; +package demoapp.dom.domain.objects.progmodel.embeddedvalues.jpa; import org.springframework.context.annotation.Profile; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder.java similarity index 94% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder.java index 6e4fdb10ff..293d17c303 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.mixins.mixins; +package demoapp.dom.domain.objects.progmodel.mixins; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_explanation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_explanation.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_explanation.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_explanation.java index 60a3dec7eb..2e40a803f4 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_explanation.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_explanation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.mixins.mixins; +package demoapp.dom.domain.objects.progmodel.mixins; import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.PropertyLayout; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_fibonacciSequence.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_fibonacciSequence.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_fibonacciSequence.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_fibonacciSequence.java index f2c413b38c..4b72b3566f 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_fibonacciSequence.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_fibonacciSequence.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.mixins.mixins; +package demoapp.dom.domain.objects.progmodel.mixins; import java.util.ArrayList; import java.util.List; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_updateCount.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_updateCount.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_updateCount.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_updateCount.java index 6d6ccc2355..8accfeb0cd 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_updateCount.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/CountHolder_updateCount.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.mixins.mixins; +package demoapp.dom.domain.objects.progmodel.mixins; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm.java similarity index 87% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm.java index 1478d7ab31..89881570e0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.mixins.mixins; +package demoapp.dom.domain.objects.progmodel.mixins; import javax.inject.Named; @@ -28,6 +28,8 @@ import org.apache.causeway.applib.annotation.Property; import org.apache.causeway.applib.annotation.PropertyLayout; import org.apache.causeway.applib.annotation.Where; +import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -39,10 +41,10 @@ import lombok.Setter; editing = Editing.DISABLED) @NoArgsConstructor @AllArgsConstructor(staticName = "of") -public class FibonacciNumberVm { +public class FibonacciNumberVm implements HasAsciiDocDescription { @ObjectSupport public String title() { - return String.format("%d ! = %d", getNumber(), getFibonacci()); + return String.format("%d! = %d", getNumber(), getFibonacci()); } @Property() diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm.layout.xml new file mode 100644 index 0000000000..99d9cddf46 --- /dev/null +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/FibonacciNumberVm.layout.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific + language governing permissions and limitations under the License. --> +<bs3:grid + xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"; + xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"; + xmlns:cpt="https://causeway.apache.org/applib/layout/component"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <bs3:row> + <bs3:col span="10" unreferencedActions="true"> + <cpt:domainObject /> + </bs3:col> + <bs3:col span="2"> + <cpt:fieldSet name="" id="sources" /> + </bs3:col> + </bs3:row> + <bs3:row> + <bs3:col span="6"> + <bs3:row> + <bs3:col span="12"> + <bs3:tabGroup> + <bs3:tab name="General"> + <bs3:row> + <bs3:col span="12"> + <bs3:row> + <bs3:col span="6"> + <cpt:fieldSet name="Number" id="identity"> + <cpt:property id="number"/> + </cpt:fieldSet> + </bs3:col> + <bs3:col span="6"> + <cpt:fieldSet name="Result" id="fib"> + <cpt:property id="fibonacci"/> + </cpt:fieldSet> + </bs3:col> + </bs3:row> + </bs3:col> + </bs3:row> + </bs3:tab> + <bs3:tab name="Metadata"> + <bs3:row> + <bs3:col span="12"> + <cpt:fieldSet name="Metadata" id="metadata" > + <cpt:property id="id"/> + <cpt:property id="logicalTypeName"/> + <cpt:property id="version"/> + </cpt:fieldSet> + </bs3:col> + </bs3:row> + </bs3:tab> + <bs3:tab name="Parent"> + <bs3:row> + <bs3:col span="12"> + <cpt:fieldSet name="Parent" id="parent"> + <cpt:property id="parent"/> + </cpt:fieldSet> + </bs3:col> + </bs3:row> + </bs3:tab> + <bs3:tab name="Other"> + <bs3:row> + <bs3:col span="12"> + <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/> + </bs3:col> + </bs3:row> + </bs3:tab> + </bs3:tabGroup> + </bs3:col> + </bs3:row> + <bs3:row> + <bs3:col span="12"> + </bs3:col> + </bs3:row> + </bs3:col> + <bs3:col span="6"> + <cpt:fieldSet name="Description" id="description" > + <cpt:action id="clearHints" position="PANEL" /> + <cpt:action id="rebuildMetamodel" position="PANEL"/> + <cpt:action id="downloadLayout" position="PANEL_DROPDOWN"/> + <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> + <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/> + <cpt:action id="downloadJdoMetamodel" position="PANEL_DROPDOWN"/> + <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/> + <cpt:action id="recentExecutions" position="PANEL_DROPDOWN"/> + <cpt:action id="recentAuditTrailEntries" position="PANEL_DROPDOWN"/> + <cpt:action id="impersonateWithRoles" position="PANEL_DROPDOWN"/> + <cpt:action id="openRestApi" position="PANEL_DROPDOWN" /> + <cpt:property id="description"/> + </cpt:fieldSet> + </bs3:col> + </bs3:row> + <bs3:row> + <bs3:col span="12" unreferencedCollections="true"/> + </bs3:row> + +</bs3:grid> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinMenu.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinMenu.java index 78f75bea7d..7fc89aae53 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.mixins.mixins; +package demoapp.dom.domain.objects.progmodel.mixins; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinPage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinPage-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinPage-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinPage-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinPage.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinPage.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinPage.java index ccf306fbfc..b3661d93f6 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinPage.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinPage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.progmodel.objects.mixins.mixins; +package demoapp.dom.domain.objects.progmodel.mixins; import javax.inject.Named; import javax.xml.bind.annotation.XmlAccessType; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinPage.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinPage.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinPage.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/objects/progmodel/mixins/MixinPage.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.layout.xml deleted file mode 100644 index 049b6cd5f4..0000000000 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.layout.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - you under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> -<bs3:grid - xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"; - xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"; - xmlns:cpt="https://causeway.apache.org/applib/layout/component"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <bs3:row> - <bs3:col span="12" unreferencedActions="true"> - <cpt:domainObject bookmarking="AS_ROOT"/> - <cpt:action bookmarking="NEVER" cssClassFa="far fa-fw fa-circle" cssClassFaPosition="LEFT" id="clearHints"> - <cpt:named>Clear Hints</cpt:named> - </cpt:action> - </bs3:col> - </bs3:row> - <bs3:row> - <bs3:col span="4"> - <bs3:row> - <bs3:col span="12"> - <bs3:tabGroup> - <bs3:tab name="Identity"> - <bs3:row> - <bs3:col span="12"> - <cpt:fieldSet name="Identity"> - <cpt:property id="number"/> - </cpt:fieldSet> - <cpt:fieldSet name="Fibonacci"> - <cpt:property id="fibonacci"/> - </cpt:fieldSet> - <cpt:fieldSet name="Details"> - <cpt:property id="parent"/> - </cpt:fieldSet> - </bs3:col> - </bs3:row> - </bs3:tab> - <bs3:tab name="Other"> - <bs3:row> - <bs3:col span="12"> - <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/> - </bs3:col> - </bs3:row> - </bs3:tab> - <bs3:tab name="Metadata"> - <bs3:row> - <bs3:col span="12"> - <cpt:fieldSet name="Metadata" id="metadata"> - <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/> - <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/> - <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> - <cpt:action id="openRestApi" position="PANEL_DROPDOWN"/> - <cpt:action id="rebuildMetamodel" position="PANEL"/> - <cpt:property hidden="ALL_TABLES" id="objectType" typicalLength="25"> - <cpt:named>Object Type</cpt:named> - </cpt:property> - <cpt:property hidden="ALL_TABLES" id="objectIdentifier" typicalLength="25"> - <cpt:named>Object Identifier</cpt:named> - </cpt:property> - </cpt:fieldSet> - </bs3:col> - </bs3:row> - </bs3:tab> - </bs3:tabGroup> - </bs3:col> - </bs3:row> - </bs3:col> - <bs3:col span="8"> - <bs3:tabGroup unreferencedCollections="true"/> - </bs3:col> - </bs3:row> -</bs3:grid> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java index 795b9b6096..3028ab2848 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java @@ -36,7 +36,7 @@ import org.apache.causeway.applib.services.factory.FactoryService; import lombok.RequiredArgsConstructor; import lombok.val; -import demoapp.dom.domain.progmodel.actions.assoc.assoc.DemoItem; +import demoapp.dom.domain.actions.progmodel.assoc.DemoItem; import demoapp.dom.featured.customui.geocoding.GeoapifyClient; import demoapp.dom.featured.customui.latlng.Zoom; import demoapp.dom.featured.customui.vm.WhereInTheWorldVm; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java index 7b084d94cc..21011c59ea 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java @@ -53,7 +53,7 @@ import lombok.Getter; import lombok.Setter; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; -import demoapp.dom.domain.progmodel.actions.assoc.assoc.DemoItem; +import demoapp.dom.domain.actions.progmodel.assoc.DemoItem; @XmlRootElement(name = "Demo") @XmlType diff --git a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml index 23c0850535..1fbb3e3c0c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml @@ -51,6 +51,7 @@ For latest we use: https://raw.githubusercontent.com/apache/causeway/master/anto <mb3:section> <mb3:named>Prog Model</mb3:named> <mb3:serviceAction objectType="demo.MixinMenu" id="mixins"/> + <mb3:serviceAction objectType="demo.CompositeValueTypeMenu" id="compositeValueTypes"/> <mb3:serviceAction objectType="demo.EmbeddedTypeMenuJpa" id="embeddedTypes"/> <mb3:serviceAction objectType="demo.EmbeddedTypeMenuJdo" id="embeddedTypes"/> </mb3:section> diff --git a/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java b/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java index d098f46870..24249929bb 100644 --- a/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java +++ b/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import lombok.val; -import demoapp.dom.domain.progmodel.objects.embedded.jdo.ComplexNumberJdo; +import demoapp.dom.domain.objects.progmodel.embeddedvalues.jdo.ComplexNumberJdo; class ComplexNumberJdo_Test {
