You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2020/05/07 16:46:23 UTC
[isis] 06/08: Merge branch 'master' of
https://github.com/apache/isis
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e44f4fcbcac46c800711f2248699ac935aaf8f0c
Merge: c542086 f49f294
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sat May 2 16:18:00 2020 +0200
Merge branch 'master' of https://github.com/apache/isis
core-parent/pom.xml | 21 +-
.../core/metamodel/commons/ClassExtensions.java | 8 +
.../defaults/ActionParameterDefaultsFacet.java | 7 +-
.../ActionParameterDefaultsFacetViaMethod.java | 61 +-
.../isis/core/metamodel/spec/ManagedObject.java | 21 +-
.../core/metamodel/spec/feature/ObjectAction.java | 13 +-
.../spec/feature/ObjectActionParameter.java | 11 +-
.../specloader/specimpl/ObjectActionDefault.java | 11 +-
.../specloader/specimpl/ObjectActionMixedIn.java | 6 +-
.../specimpl/ObjectActionParameterAbstract.java | 18 +-
.../specloader/specimpl/PendingParameterModel.java | 107 +--
...erModel.java => PendingParameterModelHead.java} | 97 +--
.../pdfjs/ui/components/PdfJsViewerPanel.java | 3 +-
incubator/pom.xml | 1 -
scripts/ci/build-demo-app.sh | 29 +-
.../AbstractObjectMemberReprRenderer.java | 3 -
.../domainobjects/ObjectActionReprRenderer.java | 39 +-
.../ObjectCollectionReprRenderer.java | 5 -
.../domainobjects/ObjectPropertyReprRenderer.java | 5 -
.../wicket/model/models/ActionArgumentModel.java | 2 -
.../viewer/wicket/model/models/ActionModel.java | 27 +-
.../viewer/wicket/model/models/EntityModel.java | 2 +-
.../wicket/model/models/FormExecutorContext.java | 2 -
.../viewer/wicket/model/models/ScalarModel.java | 873 ++-------------------
.../wicket/model/models/ScalarParameterModel.java | 318 ++++++++
.../wicket/model/models/ScalarPropertyModel.java | 377 +++++++++
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 2 +-
.../components/actions/ActionParametersForm.java | 5 +-
.../ui/components/property/PropertyEditForm.java | 19 +-
.../components/property/PropertyEditFormPanel.java | 8 +-
.../property/PropertyEditFormPanelFactory.java | 6 +-
.../ui/components/property/PropertyEditPanel.java | 9 +-
.../property/PropertyEditPanelFactory.java | 6 +-
.../property/PropertyFormExecutorStrategy.java | 10 +-
.../PropertyEditPromptHeaderPanel.java | 6 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 4 +-
.../components/scalars/ScalarPanelAbstract2.java | 45 +-
.../scalars/ScalarPanelSelect2Abstract.java | 6 +-
.../wicket/ui/panels/PromptFormAbstract.java | 5 +-
39 files changed, 1016 insertions(+), 1182 deletions(-)