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 2022/04/04 15:09:18 UTC

[isis] 01/01: Merge pull request #881 from apache/2877_value.comps

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 08212804f8db6b5c2708e83a542227d3e309afda
Merge: a16319dca6 da66bae58e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Apr 4 17:09:11 2022 +0200

    Merge pull request #881 from apache/2877_value.comps
    
    [Wicket Viewer] ScalarPanel Refactoring

 .../java/org/apache/isis/applib/Identifier.java    |  12 +-
 .../apache/isis/applib/annotation/PromptStyle.java |   6 +-
 .../value/semantics/ValueSemanticsProvider.java    |   7 -
 .../isis/commons/internal/base/_Oneshot.java       |  34 +-
 .../internal/base/_StringInterpolation.java        |  46 ++-
 .../isis/commons/internal/delegate/_Delegate.java  |  84 +++++
 .../position/ActionPositionFacetAbstract.java      |  13 +-
 .../position/ActionPositionFacetFallback.java      |   2 +-
 .../defaultview/DefaultViewFacetAbstract.java      |  15 +-
 .../layout/CollectionLayoutFacetFactory.java       |   3 +-
 ...tion.java => DefaultViewFacetAsConfigured.java} |  22 +-
 ...aultViewFacetForCollectionLayoutAnnotation.java |  14 +-
 .../facets/object/value/CompositeValueUpdater.java |  92 +++++
 .../value/CompositeValueUpdaterForParameter.java   |  62 ++++
 .../value/CompositeValueUpdaterForProperty.java    |  62 ++++
 .../metamodel/facets/object/value/ValueFacet.java  |  19 ++
 .../facets/object/value/ValueFacetAbstract.java    |  73 +++-
 .../interactions/managed/ActionInteraction.java    |  89 +++++
 .../interactions/managed/InteractionVeto.java      |  20 +-
 .../interactions/managed/ManagedAction.java        |  46 +--
 .../interactions/managed/ManagedCollection.java    |   6 +
 .../interactions/managed/ManagedValue.java         |  15 +
 .../managed/PropertyNegotiationModel.java          |   4 +-
 .../identify/ObjectBookmarker_builtinHandlers.java |  30 +-
 .../isis/core/metamodel/spec/ManagedObjects.java   |  21 +-
 .../isis/core/metamodel/spec/feature/MixedIn.java  |  45 ++-
 .../core/metamodel/spec/feature/ObjectAction.java  |  72 +++-
 .../specloader/specimpl/ObjectActionDefault.java   |   1 -
 .../specimpl/ObjectSpecificationAbstract.java      |  77 ++---
 .../valuesemantics/BooleanValueSemantics.java      |  16 +-
 .../valuesemantics/URLValueSemantics.java          |  14 +-
 .../command/SchemaValueMarshallerDefault.java      |   8 +-
 .../templresources/TemplateResourceServlet.java    |  13 +-
 .../webappctx/IsisWebAppContextInitializer.java    |   2 +-
 .../progmodel/depargs/DependentArgsActionDemo.java |   4 +
 .../cal/jpa/IsisCalendarEventJpa_update.java       |  94 ------
 ..._updateReadOnlyOptionalPropertyWithChoices.java |  71 ++++
 .../common/ui/custom/WhereInTheWorldPanel.java     |   7 +-
 .../fullcalendar/applib/value/CalendarEvent.html   |   8 +
 .../applib/value/CalendarEventSemantics.java       |  66 ++--
 .../isis/testdomain/value/ValueSemanticsTest.java  |  44 +--
 .../viewers/{jdo => jpa}/wkt/TestAppJpaWkt.java    |   6 +-
 .../viewers/jpa/wkt/InteractionTestJpaWkt.java     |   6 +-
 .../testdomain/conf/Configuration_usingWicket.java |  41 +--
 .../common/model/action/ActionFormUiModel.java     |   5 +
 .../links/ActionLinkUiComponentFactoryWkt.java     |   5 +-
 .../viewer/wicket/model/links/LinkAndLabel.java    |  29 +-
 .../wicket/model/links/ListOfLinksModel.java       |   3 +-
 .../viewer/wicket/model/models/ActionModel.java    |  38 +--
 .../wicket/model/models/ChainingObjectModel.java   |   8 +-
 .../wicket/model/models/FileUploadModels.java      |   5 +-
 .../wicket/model/models/FormExecutorContext.java   |   2 +-
 .../wicket/model/models/ObjectAdapterModel.java    |   6 +-
 .../viewer/wicket/model/models/ScalarModel.java    |  41 ++-
 .../interaction/act/ActionInteractionWkt.java      |  27 +-
 .../wicket/model/util/PageParameterUtils.java      |  21 ++
 .../ui/app/registry/ComponentFactoryRegistry.java  |   6 +-
 .../AdditionalLinksAsListInlinePanel.html          |   2 +-
 .../entityactions/LinkAndLabelFactory.java         |  31 +-
 .../serviceactions/ServiceActionsPanel.css         |   2 +-
 .../components/actions/ActionParametersForm.java   |  49 ++-
 .../actions/ActionParametersFormPanel.java         |  21 +-
 .../components/actions/ActionParametersPanel.java  |  22 +-
 .../actions/ActionParametersPanelFactory.java      |   3 +-
 .../CollectionPresentationSelectorPanel.java       |   6 -
 .../ajaxtable/columns/GenericPropertyColumn.java   |   9 +-
 .../entity/icontitle/EntityIconAndTitlePanel.html  |   4 +-
 .../entity/icontitle/EntityIconAndTitlePanel.java  |  25 +-
 .../wicket/ui/components/header/HeaderPanel.java   |   4 +-
 .../ui/components/property/PropertyEditForm.java   |  57 +---
 .../components/property/PropertyEditFormPanel.html |  17 +-
 .../components/property/PropertyEditFormPanel.java |  15 +-
 .../property/PropertyEditFormPanel.properties      |  22 --
 .../ui/components/property/PropertyEditPanel.java  |   9 +-
 .../scalars/ComponentFactoryScalarAbstract.java    |   8 +-
 .../components/scalars/ScalarFragmentFactory.java  | 166 +++++++--
 .../ui/components/scalars/ScalarPanelAbstract.java | 165 ++++-----
 .../components/scalars/ScalarPanelAbstract2.java   | 242 +++++++++-----
 .../ScalarPanelFormFieldAbstract-debug.html        | 221 ++++++++++++
 .../scalars/ScalarPanelFormFieldAbstract.html      | 167 ++++++---
 .../scalars/ScalarPanelFormFieldAbstract.java      | 147 ++++----
 .../scalars/ScalarPanelSelectAbstract.java         | 173 +++-------
 .../scalars/ScalarPanelTextFieldAbstract.java      |  79 ++---
 .../scalars/ScalarPanelTextFieldNumeric.java       |  15 -
 .../scalars/ScalarPanelTextFieldWithComposite.java |  51 ---
 .../viewer/wicket/ui/components/scalars/_Util.java | 167 +++++++++
 .../blobclob/IsisBlobOrClobPanelAbstract.java      | 372 ++++++++++-----------
 ...ract.html => _IsisBlobOrClobPanelAbstract.html} |   3 +-
 .../scalars/{primitive => bool}/BooleanPanel.java  |  73 ++--
 .../{primitive => bool}/BooleanPanelFactory.java   |   2 +-
 .../scalars/composite/CompositeValuePanel.java     |  97 ++++++
 .../components/scalars/primitive/BooleanPanel.html |  87 -----
 .../primitive/BooleanPanel_labelRightPosition.html |  87 -----
 .../scalars/reference/EntityLinkSelect2Panel.java  |   6 +-
 .../scalars/reference/ReferencePanel.html          |  97 ------
 .../scalars/reference/ReferencePanel.java          | 223 +++++-------
 .../scalars/reference/ReferencePanelFactory.java   |  11 +-
 ...rTitlePanel.java => ScalarTitleBadgePanel.java} |  15 +-
 .../valuechoices/ValueChoicesSelect2Panel.html     |  80 -----
 .../valuechoices/ValueChoicesSelect2Panel.java     |  55 ++-
 .../ValueChoicesSelect2PanelFactory.java           |  15 +-
 .../ui/components/tree/ParentedTreePanel.java      |   6 -
 .../widgets/breadcrumbs/BreadcrumbPanel.java       |  10 +-
 .../entitysimplelink/EntityLinkSimplePanel.java    |  32 +-
 .../widgets/linkandlabel/ActionLink.java           |  70 ++--
 .../widgets/links/AjaxLinkNoPropagate.java         |  93 ++++++
 .../ui/components/widgets/select2/Select2.java     |   1 +
 .../ObjectAdapterMementoProviderAbstract.java      |  16 +-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |  41 +--
 .../wicket/ui/pages/bootstrap-overrides-all-v2.css |  68 ++--
 .../viewer/wicket/ui/pages/entity/EntityPage.css   |  22 +-
 .../viewer/wicket/ui/pages/entity/EntityPage.html  |   8 +-
 .../wicket/ui/pages/jquery.isis.wicket.viewer.js   |   5 +
 .../isis/viewer/wicket/ui/panels/FormAbstract.java |   8 +
 .../isis/viewer/wicket/ui/panels/OkCancelForm.java |   5 +-
 .../isis/viewer/wicket/ui/panels/PanelBase.java    |  21 +-
 .../wicket/ui/panels/PromptFormAbstract.java       |   4 +-
 .../viewer/wicket/ui/util/BootstrapConstants.java  |  83 +++++
 .../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 252 +++++++++-----
 .../isis/viewer/wicket/ui/util/WktDecorators.java  |  17 +-
 .../isis/viewer/wicket/ui/util/WktLinks.java       |  15 +-
 .../viewer/wicket/ui/validation/ValidatorBase.java |  20 +-
 .../ComponentFactoryRegistrarDefault.java          |   8 +-
 .../ComponentFactoryRegistryDefault.java           |   4 +-
 124 files changed, 3279 insertions(+), 2240 deletions(-)