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 c542086ffdb84215c6de71ccc523abb749daa733 Merge: a4d2560 017c916 Author: Jörg Rade <joerg.r...@kuehne-nagel.com> AuthorDate: Fri May 1 16:53:40 2020 +0200 Merge branch 'master' of https://github.com/apache/isis .../examples/mixins/layout/Object_openRestApi.java | 2 +- .../mixins/layout/Object_rebuildMetamodel.java | 2 +- .../isis/applib/layout/grid/bootstrap3/BS3Col.java | 8 +- .../applib/mixins/layout/Object_openRestApi.java | 2 +- .../mixins/layout/Object_rebuildMetamodel.java | 2 +- .../isis/applib/services/grid/GridService.java | 1 - .../isis/applib/services/jaxb/JaxbService.java | 1 - core-parent/pom.xml | 1 + .../apache/isis/core/commons/collections/Can.java | 9 +- .../isis/core/commons/collections/Can_Empty.java | 2 + .../core/commons/collections/Can_Multiple.java | 2 + .../core/commons/collections/Can_Singleton.java | 2 + .../isis/core/commons/internal/base/_Either.java | 18 +- .../isis/core/commons/internal/base/_NullSafe.java | 16 +- .../core/commons/internal/collections/_Arrays.java | 3 + .../core/commons/internal/primitives/_Ints.java | 22 ++ .../core/commons/internal/reflection/_Reflect.java | 19 ++ .../isis/core/metamodel/commons/MethodUtil.java | 40 ++- .../core/metamodel/facets/DomainEventHelper.java | 10 +- .../isis/core/metamodel/facets/FacetFactory.java | 4 +- .../core/metamodel/facets/MethodFinderUtils.java | 118 +++++++- .../facets/OrphanedSupportingMethodValidator.java | 2 +- ...ependentArgUtils.java => ParameterSupport.java} | 114 ++++++-- ...nChoicesForCollectionParameterFacetFactory.java | 6 +- .../invocation/ActionDomainEventFacetAbstract.java | 16 +- .../action/invocation/ActionInvocationFacet.java | 5 +- ...ctionInvocationFacetForDomainEventAbstract.java | 20 +- .../actions/validate/ActionValidationFacet.java | 5 +- .../method/ActionValidationFacetViaMethod.java | 3 +- ...tionAddToRemoveFromAndValidateFacetFactory.java | 4 +- .../facets/members/cssclassfa/CssClassFaFacet.java | 39 ++- .../cssclassfa/CssClassFaFacetAbstract.java | 119 ++++++-- .../object/autocomplete/AutoCompleteFacet.java | 5 +- .../autocomplete/AutoCompleteFacetAbstract.java | 7 +- .../objectvalue/typicallen/TypicalLengthFacet.java | 19 ++ .../ActionParameterAutoCompleteFacet.java | 5 +- .../ActionParameterAutoCompleteFacetViaMethod.java | 17 +- ...ParameterAutoCompleteFacetViaMethodFactory.java | 12 +- .../param/choices/ActionParameterChoicesFacet.java | 5 +- .../choices/ActionParameterChoicesFacetNone.java | 5 +- ...rameterChoicesFacetDerivedFromChoicesFacet.java | 5 +- .../method/ActionChoicesFacetViaMethodFactory.java | 5 +- .../ActionParameterChoicesFacetViaMethod.java | 15 +- ...ctionParameterChoicesFacetViaMethodFactory.java | 11 +- .../defaults/ActionParameterDefaultsFacet.java | 12 +- .../ActionParameterDefaultsFacetViaMethod.java | 99 ++++--- ...tionParameterDefaultsFacetViaMethodFactory.java | 101 +++---- .../disable/ActionParameterDisabledFacet.java | 5 +- .../ActionParameterDisabledFacetViaMethod.java | 14 +- ...tionParameterDisabledFacetViaMethodFactory.java | 11 +- .../param/hide/ActionParameterHiddenFacet.java | 5 +- .../ActionParameterHiddenFacetViaMethod.java | 14 +- ...ActionParameterHiddenFacetViaMethodFactory.java | 11 +- .../BooleanValueSemanticsProviderAbstract.java | 2 +- .../facets/value/string/StringValueFacet.java | 5 - .../value/string/StringValueSemanticsProvider.java | 13 +- .../TemporalValueSemanticsProviderAbstract.java | 10 +- .../interactions/ActionArgUsabilityContext.java | 9 +- .../interactions/ActionArgValidityContext.java | 11 +- .../interactions/ActionArgVisibilityContext.java | 9 +- .../interactions/ActionValidityContext.java | 9 +- .../core/metamodel/layout/LayoutFacetUtil.java | 2 +- .../metamodel/objectmanager/ObjectManager.java | 2 +- ...arameterChoicesFacetFromParentedCollection.java | 4 +- ...meterDefaultsFacetFromAssociatedCollection.java | 11 +- .../isis/core/metamodel/spec/ManagedObject.java | 112 ++++++-- .../core/metamodel/spec/feature/ObjectAction.java | 45 +-- .../spec/feature/ObjectActionParameter.java | 23 +- .../metamodel/spec/feature/ObjectAssociation.java | 3 + .../spec/interaction/ActionInteraction.java | 170 +++++++++++ .../spec/interaction/CollectionInteraction.java | 61 ++++ .../spec/interaction/InteractionVeto.java | 102 +++++++ .../metamodel/spec/interaction/ManagedAction.java | 88 ++++++ .../spec/interaction/ManagedCollection.java | 77 +++++ .../metamodel/spec/interaction/ManagedMember.java | 155 ++++++++++ .../interaction/ManagedParameter.java} | 48 ++-- .../spec/interaction/ManagedParameterList.java | 58 ++++ .../spec/interaction/ManagedProperty.java | 98 +++++++ .../spec/interaction/MemberInteraction.java | 107 +++++++ .../spec/interaction/PropertyInteraction.java | 62 ++++ .../metamodel/specloader/specimpl/Factories.java | 14 - .../specimpl/ObjectActionContributee.java | 253 ----------------- .../specloader/specimpl/ObjectActionDefault.java | 93 +++--- .../specloader/specimpl/ObjectActionMixedIn.java | 12 +- .../specimpl/ObjectActionParameterAbstract.java | 83 ++---- .../ObjectActionParameterContributeeAbstract.java | 93 ------ .../ObjectActionParameterMixedInAbstract.java | 39 +-- .../specimpl/ObjectSpecificationAbstract.java | 98 +------ .../OneToManyActionParameterContributee.java | 43 --- .../specimpl/OneToManyAssociationContributee.java | 4 +- .../specimpl/OneToManyAssociationMixedIn.java | 4 +- .../OneToOneActionParameterContributee.java | 38 --- .../specimpl/OneToOneAssociationContributee.java | 4 +- .../specimpl/OneToOneAssociationMixedIn.java | 4 +- .../specloader/specimpl/PendingParameterModel.java | 147 ++++++++++ .../metamodel/specloader/specimpl/Predicates.java | 54 ---- ...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 4 +- .../cssclassfa/CssClassFaFacetAbstractTest.java | 6 +- .../DomainObjectLayoutFactoryTest.java | 4 +- core/pom.xml | 2 +- .../command/CommandExecutorServiceDefault.java | 8 +- .../i18n/po/TranslationServicePoMenu.java | 2 +- .../handlers/DomainObjectInvocationHandler.java | 18 +- .../security/authentication/logout/LogoutMenu.java | 2 +- .../webapp/context/IsisWebAppCommonContext.java | 9 + ...entoService.java => ObjectMementoForEmpty.java} | 39 ++- .../context/memento/ObjectMementoService.java | 4 + examples/demo/pom.xml | 201 +------------ .../DependentArgsActionDemo_useAutoComplete.java | 15 +- .../DependentArgsActionDemo_useChoices.java | 17 +- .../DependentArgsActionDemo_useDefault.java | 15 +- .../DependentArgsActionDemo_useDisable.java | 10 +- .../depargs/DependentArgsActionDemo_useHide.java | 17 +- .../java/demoapp/dom/linebreaker/LineBreaker.java | 35 +++ .../java/demoapp/dom/types/FeaturedTypesMenu.java | 2 +- .../java/demoapp/dom/types/time/TemporalDemo.java | 23 +- .../demo/src/main/java/demoapp/utils/DemoStub.java | 2 +- .../main/java/demoapp/utils/ThereCanBeOnlyOne.java | 57 ++++ .../demo/src/main/java/demoapp/webapp/DemoApp.java | 173 ------------ .../main/java/demoapp/webapp/DemoAppManifest.java | 139 +++++++++ .../main/java/demoapp/webapp/menubars.layout.xml | 1 + examples/{demo-vaadin => demo/vaadin}/pom.xml | 9 +- .../java/demoapp/webapp/vaadin}/DemoAppVaadin.java | 19 +- .../vaadin}/src/main/resources/log4j2-spring.xml | 0 examples/demo/{ => wicket}/pom.xml | 17 +- .../java/demoapp/webapp/wicket/DemoAppWicket.java} | 37 +-- .../wicket}/src/main/resources/log4j2-spring.xml | 18 ++ .../model/good/ProperParameterSupport.java | 131 +++++++++ .../testdomain/auditing/AuditerServiceTest.java | 3 +- .../publishing/PublisherServiceTest.java | 3 +- .../vaadin/model/action/ActionFactoryVaa.java | 14 +- .../viewer/vaadin/model/decorator/Decorators.java | 104 +++++-- incubator/viewers/vaadin/ui/pom.xml | 31 +- .../vaadin/ui/IsisModuleIncViewerVaadinUi.java | 22 +- .../viewer/vaadin/ui/binding/BinderUtil.java | 166 +++++++++++ .../ui/components/UiComponentFactoryVaa.java | 62 ++++ .../ui/components/UiComponentHandlerVaa.java | 11 +- .../vaadin/ui/components/blob/BlobField.java | 68 +++++ .../ui/components/blob/BlobFieldFactory.java | 49 ++++ .../vaadin/ui/components/clob/ClobField.java | 48 +++- .../ui/components/clob/ClobFieldFactory.java | 49 ++++ .../vaadin/ui/components/collection/TableView.java | 63 +++-- .../vaadin/ui/components/debug/DebugField.java | 77 +++++ .../vaadin/ui/components/debug/DebugUiModel.java | 24 +- .../vaadin/ui/components/markup/MarkupField.java | 47 ++-- .../ui/components/markup/MarkupFieldFactory.java | 47 ++++ .../ui/components/object/ObjectFormView.java | 311 ++++++++++++++------- .../ui/components/other/FallbackFieldFactory.java | 97 +++++++ .../vaadin/ui/components/temporal/DateField.java | 48 ++-- .../components/temporal/TemporalFieldFactory.java | 125 +++++++++ .../ui/components/text/TextFieldFactory.java | 61 ++++ .../ui/components/text/uuid/UuidFieldFactory.java | 78 ++++++ .../viewer/vaadin/ui/pages/main/MainView.java | 18 +- .../ui/pages/main/MainView_createHeader.java | 37 ++- .../viewer/vaadin/ui/util/LocalResourceUtil.java | 61 ++++ scripts/ci/build-demo-app.sh | 31 +- valuetypes/asciidoc/ui/pom.xml | 18 +- .../asciidoc/ui/components/js/prism1.14.js | 8 - valuetypes/asciidoc/ui/vaadin/pom.xml | 42 +++ .../ui/vaa/IsisModuleValAsciidocUiVaa.java} | 9 +- .../ui/vaa/components/AsciiDocFieldFactoryVaa.java | 59 ++++ .../ui/vaa/components/AsciiDocFieldVaa.java | 64 +++++ .../asciidoc/ui/vaa/components/PrismResources.java | 45 +++ .../main/resources/static/prism/css/prism1.20.css} | 92 +++--- .../main/resources/static/prism/js/prism1.20.js | 13 + valuetypes/asciidoc/ui/wicket/pom.xml | 41 +++ .../ui/wkt/IsisModuleValAsciidocUiWkt.java} | 10 +- .../ui/wkt/components/AsciiDocComponentWkt.java} | 27 +- .../wkt/components/AsciiDocPanelFactoriesWkt.java} | 8 +- .../ui/wkt/components/prism/PrismResources.java | 40 +++ .../ui/wkt/components/prism/css/prism1.20.css} | 92 +++--- .../ui/wkt/components/prism/js/prism1.20.js | 13 + valuetypes/pom.xml | 7 +- viewers/common/pom.xml | 6 + .../action/ActionLinkUiComponentDecorator.java | 25 +- .../common/model/action/ActionUiMetaModel.java | 19 +- .../viewer/common/model/action/ActionUiModel.java | 4 +- .../common/model/binding/UiComponentFactory.java | 142 ++++++++++ .../model/binding/interaction/ObjectBinding.java | 81 ++++++ .../ConfirmDecorator.java} | 8 +- .../model/decorator/confirm/ConfirmUiModel.java | 68 +++++ .../DangerDecorator.java} | 8 +- .../DisableDecorator.java} | 8 +- .../DisableUiModel.java} | 37 +-- .../model/decorator/fa/FontAwesomeDecorator.java | 10 +- .../model/decorator/fa/FontAwesomeUiModel.java | 27 +- .../PrototypingDecorator.java} | 8 +- .../model/decorator/tooltip/TooltipDecorator.java | 20 +- .../common/model/gridlayout/UiGridLayout.java | 162 +++++++++++ .../isis/viewer/common/model/menu/MenuUiModel.java | 30 +- .../model/menu/MenuUiModel_buildMenuItems.java | 42 ++- .../common/model/menuitem/MenuItemUiModel.java | 2 + .../model/userprofile/UserProfileUiModel.java | 4 + .../userprofile/UserProfileUiModelProvider.java | 5 +- .../AbstractObjectMemberReprRenderer.java | 21 +- .../domainobjects/DomainObjectReprRenderer.java | 9 +- .../rendering/domainobjects/MemberReprMode.java | 29 -- .../domainobjects/ObjectActionReprRenderer.java | 10 +- .../domainobjects/ObjectAndActionInvocation.java | 27 +- .../domainobjects/ObjectAndCollection2.java | 39 --- .../rendering/domainobjects/ObjectAndMember.java | 41 --- .../rendering/domainobjects/ObjectAndProperty.java | 30 -- .../ObjectCollectionReprRenderer.java | 3 +- .../domainobjects/ObjectPropertyReprRenderer.java | 3 +- .../rendering/service/RepresentationService.java | 20 +- .../RepresentationServiceContentNegotiator.java | 19 +- .../service/conneg/ContentNegotiationService.java | 12 +- .../conneg/ContentNegotiationServiceAbstract.java | 12 +- ...entNegotiationServiceForRestfulObjectsV1_0.java | 33 +-- .../ContentNegotiationServiceOrgApacheIsisV1.java | 17 +- .../service/swagger/SwaggerServiceMenu.java | 4 +- viewers/restfulobjects/viewer/pom.xml | 5 + .../restfulobjects/viewer/mappers/FailureUtil.java | 8 +- .../resources/DomainObjectResourceServerside.java | 102 +++---- .../viewer/resources/DomainResourceHelper.java | 134 +++++---- .../resources/InteractionFailureHandler.java | 95 +++++++ .../viewer/resources/ObjectActionArgHelper.java | 33 +-- .../resources/ObjectAdapterAccessHelper.java | 136 ++++----- .../links/ActionLinkUiComponentFactoryWkt.java} | 16 +- .../viewer/wicket/model/links/LinkAndLabel.java | 65 ++++- .../wicket/model/links/ListOfLinksModel.java | 28 +- .../wicket/model/models/ActionArgumentModel.java | 5 +- .../viewer/wicket/model/models/ActionModel.java | 27 +- .../viewer/wicket/model/models/EntityModel.java | 30 +- .../viewer/wicket/model/models/ScalarModel.java | 108 ++++--- viewers/wicket/ui/pom.xml | 4 + .../components/actionmenu/CssClassFaBehavior.java | 4 +- .../entityactions/AdditionalLinksPanel.java | 34 +-- .../entityactions/EntityActionLinkFactory.java | 17 +- .../actionmenu/serviceactions/CssMenuItem.java | 66 ++++- .../serviceactions/MenuActionLinkFactory.java | 10 +- .../actionmenu/serviceactions/MenuActionWkt.java | 39 --- .../serviceactions/ServiceActionUtil.java | 60 ++-- .../components/actions/ActionParametersForm.java | 13 +- .../entity/icontitle/EntityIconAndTitlePanel.java | 11 +- .../components/scalars/ScalarPanelAbstract2.java | 16 +- .../scalars/ScalarPanelSelect2Abstract.java | 11 +- .../scalars/markup/MarkupComponent_reloadJs.java | 6 +- .../scalars/reference/ReferencePanel.java | 19 +- .../valuechoices/ValueChoicesSelect2Panel.java | 14 +- .../ObjectAdapterMementoProviderAbstract.java | 33 +-- .../ObjectAdapterMementoProviderForChoices.java | 5 +- ...tAdapterMementoProviderForReferenceChoices.java | 11 +- ...entoProviderForReferenceObjectAutoComplete.java | 10 +- ...derForReferenceParamOrPropertyAutoComplete.java | 37 +-- ...bjectAdapterMementoProviderForValueChoices.java | 23 +- .../isis/viewer/wicket/ui/pages/PageAbstract.java | 4 +- .../isis/viewer/wicket/ui/pages/home/HomePage.java | 2 +- .../isis/viewer/wicket/ui/util/Confirmations.java | 82 ------ .../isis/viewer/wicket/ui/util/Decorators.java | 174 +++++++++++- .../ui/util/FontAwesomeCssReferenceWkt.java} | 37 +-- .../isis/viewer/wicket/ui/util/Tooltips.java | 7 +- ...tAdapterMementoProviderForValueChoicesTest.java | 13 +- .../wicket/viewer/mixins/Object_clearHints.java | 2 +- .../mementos/ObjectMementoServiceWicket.java | 33 ++- 255 files changed, 6235 insertions(+), 3057 deletions(-)