You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/10/29 20:28:15 UTC
[isis] 20/23: Merge remote-tracking branch 'origin/v2' into v2
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9d9097a7bd055cc77409627b70cc275ef5988d6a
Merge: c42d6fc fab2ea6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 29 19:24:54 2019 +0000
Merge remote-tracking branch 'origin/v2' into v2
.../isis/commons/internal/collections/_Maps.java | 31 +++++++++---
.../isis/metamodel/facetapi/FacetHolderImpl.java | 2 +-
.../metamodel/facets/WhereValueFacetAbstract.java | 1 +
.../facets/members/hidden/HiddenFacetAbstract.java | 8 +++-
.../facets/object/parseable/ParseableFacet.java | 3 +-
.../apache/isis/metamodel/spec/ManagedObject.java | 16 +++++++
.../isis/runtime/memento/ObjectAdapterMemento.java | 2 +-
.../memento/ObjectAdapterMementoCollection.java | 6 +--
.../memento/ObjectAdapterMementoSupport.java | 3 +-
.../ObjectAdapterMementoSupport_usingDefault.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 23 +++++----
.../domainobjects/JsonValueEncoder_Converters.java | 4 +-
.../JsonValueEncoderTest_appendValueAndFormat.java | 10 ++--
.../JsonValueEncoderTest_asAdapter.java | 56 ++++++++++------------
.../JsonValueEncoderTest_asObject.java | 14 ++----
.../wicket/viewer/IsisWicketApplication.java | 5 +-
.../IsisWicketApplication_newPageFactory.java | 7 ++-
.../wicket/ConverterForObjectAdapter.java | 16 +++----
.../wicket/ConverterForObjectAdapterMemento.java | 8 ++--
.../registries/pages/PageClassListDefault.java | 1 +
.../viewer/services/DeepLinkServiceWicket.java | 4 +-
.../viewer/IsisWicketApplication_Defaults.java | 3 +-
...ageClassListDefault_RegistrationAndCaching.java | 2 +
.../wicket/model/common/PageParametersUtils.java | 13 ++---
.../wicket/model/models/EntityCollectionModel.java | 21 ++------
.../viewer/wicket/model/models/EntityModel.java | 10 ++--
.../isis/viewer/wicket/model/models/PageType.java | 1 +
.../viewer/wicket/model/models/ScalarModel.java | 6 +--
.../wicket/model/models/ServiceActionsModel.java | 18 +++----
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../ajaxtable/columns/ColumnAbstract.java | 20 ++++++--
.../columns/ObjectAdapterPropertyColumn.java | 6 +--
.../components/scalars/IsisConverterLocator.java | 6 +--
.../scalars/ScalarPanelSelect2Abstract.java | 5 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 4 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 4 +-
.../components/scalars/markup/MarkupComponent.java | 10 ++--
.../scalars/reference/EntityLinkSelect2Panel.java | 3 +-
.../scalars/reference/ReferencePanel.java | 2 +-
.../components/tree/IsisToWicketTreeAdapter.java | 10 ++--
.../ObjectAdapterMementoProviderAbstract.java | 3 +-
.../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 33 ++++++++++---
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 7 +++
43 files changed, 239 insertions(+), 172 deletions(-)