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 2021/05/08 07:03:53 UTC

[isis] 01/01: Merge pull request #527 from apache/2648-wkt.coll.model

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit aaf3aa3907fd0799b4fe307d4667e13629aa3dd4
Merge: 7b8cda7 483e052
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 8 09:03:39 2021 +0200

    Merge pull request #527 from apache/2648-wkt.coll.model
    
    ISIS-2648: split the entity coll. model into 3 concrete types

 .../metamodel/facets/object/paged/PagedFacet.java  |  16 +
 .../interactions/managed/ManagedProperty.java      |  64 +--
 .../core/metamodel/spec/feature/ObjectAction.java  |  70 +--
 .../spec/feature/ObjectActionParameter.java        |  25 +-
 .../spec/feature/OneToManyAssociation.java         |   9 +
 .../spec/feature/OneToOneAssociation.java          |   7 +
 .../spec/feature/memento/ActionMemento.java        |  90 ++++
 .../feature/memento/ActionParameterMemento.java    |  91 ++++
 .../spec/feature/memento/CollectionMemento.java    |  83 +++
 .../spec/feature/memento/PropertyMemento.java      |  83 +++
 .../specloader/specimpl/ObjectActionDefault.java   |   3 +-
 .../isis/core/runtime/memento/ObjectMemento.java   |  18 +-
 .../common/ui/custom/WhereInTheWorldPanel.java     |  10 +-
 .../ui/components/ScalarPanelAbstractLegacy.java   |  26 +-
 .../common/model/action/ActionUiMetaModel.java     |  44 +-
 .../common/model/mementos/ActionMemento.java       |  97 ----
 .../viewer/wicket/model/links/LinkAndLabel.java    |  51 +-
 .../viewer/wicket/model/links/LinksProvider.java   |   5 +-
 .../wicket/model/links/ListOfLinksModel.java       |  52 +-
 .../model/mementos/ActionParameterMemento.java     |  94 ----
 .../wicket/model/mementos/CollectionMemento.java   | 106 ----
 .../wicket/model/mementos/PropertyMemento.java     | 128 -----
 .../wicket/model/models/ActionArgumentCache.java   |  59 +--
 .../viewer/wicket/model/models/ActionModel.java    |  76 ++-
 .../wicket/model/models/EntityCollectionModel.java | 558 +++------------------
 .../models/EntityCollectionModelAbstract.java      | 167 ++++++
 .../model/models/EntityCollectionModelDummy.java   |  90 ++++
 .../models/EntityCollectionModelParented.java      | 182 +++++++
 .../models/EntityCollectionModelStandalone.java    | 129 +++++
 .../viewer/wicket/model/models/EntityModel.java    |  65 +--
 .../wicket/model/models/PageParameterUtil.java     |  80 +--
 .../viewer/wicket/model/models/ScalarModel.java    |  63 ++-
 .../wicket/model/models/ScalarParameterModel.java  |  42 +-
 .../wicket/model/models/ScalarPropertyModel.java   |  57 +--
 .../actionresponse/ActionResultResponseType.java   |  23 +-
 .../AdditionalLinksAsDropDownPanel.java            |   5 +-
 .../AdditionalLinksAsListInlinePanel.java          |   5 +-
 .../entityactions/AdditionalLinksPanel.java        |  33 +-
 .../entityactions/EntityActionLinkFactory.java     |  14 +-
 .../actionmenu/entityactions/LinkAndLabelUtil.java |  43 +-
 .../serviceactions/MenuActionLinkFactory.java      |   8 +-
 .../serviceactions/ServiceActionUtil.java          |  44 +-
 .../collection/AssociatedWithActionsHelper.java    |  70 ---
 .../ui/components/collection/CollectionPanel.java  |  43 +-
 .../selector/CollectionSelectorHelper.java         |  94 ++--
 .../selector/CollectionSelectorPanel.java          |  11 +-
 .../CollectionContentsAsAjaxTablePanel.java        |   8 +-
 .../columns/ObjectAdapterPropertyColumn.java       |  20 +-
 .../columns/ObjectAdapterTitleColumn.java          |  42 +-
 .../CollectionContentsMultipleViewsPanel.java      |  30 +-
 .../entity/collection/EntityCollectionPanel.java   |  44 +-
 .../components/entity/fieldset/PropertyGroup.java  |  35 +-
 .../entity/header/EntityHeaderPanel.java           |  21 +-
 .../wicket/ui/components/layout/bs3/col/Col.java   |  37 +-
 .../ui/components/scalars/ScalarPanelAbstract.java |  88 ++--
 .../StandaloneCollectionPanel.java                 |  17 +-
 .../StandaloneCollectionPanelFactory.java          |  10 +-
 .../StandaloneCollectionPage.java                  |  18 +-
 58 files changed, 1760 insertions(+), 1743 deletions(-)