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 2021/09/12 05:29:55 UTC

[isis] 04/04: Merge remote-tracking branch 'origin/master'

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 1cb2f7a73a9ea8eec170fd745789cfcfbb24ec21
Merge: 879a6ff 93184f0
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Sun Sep 12 07:29:39 2021 +0200

    Merge remote-tracking branch 'origin/master'

 .../exceprecog/ExceptionRecognizerAbstract.java    |  25 ++-
 .../commons/internal/ioc/_IocContainer_Spring.java |  18 +-
 .../isis/core/metamodel/facets/ActionSupport.java  |  44 ++--
 .../isis/core/metamodel/facets/Evaluators.java     |   5 +-
 .../core/metamodel/facets/ParameterSupport.java    |  76 +++----
 ...tedFacetAnnotationElseConfigurationFactory.java |  12 +-
 .../annotation/TitleFacetViaTitleAnnotation.java   |   7 +-
 ...ParameterAutoCompleteFacetViaMethodFactory.java |   3 +-
 .../core/metamodel/spec/ObjectSpecification.java   |   2 +
 .../metamodel/spec/feature/ObjectAssociation.java  |  25 ---
 .../spec/feature/ObjectAssociationContainer.java   |  12 +-
 .../core/metamodel/spec/feature/ObjectFeature.java |  55 +++++
 .../specimpl/ObjectActionParameterAbstract.java    |  19 +-
 .../specimpl/ObjectAssociationAbstract.java        |  28 ---
 .../specloader/specimpl/ObjectMemberAbstract.java  |  27 +++
 .../specimpl/dflt/ObjectSpecificationDefault.java  |  15 ++
 .../specimpl/dflt/_PropertiesAsColumns.java        | 215 +++++---------------
 .../testspec/ObjectSpecificationStub.java          |  22 ++
 .../handlers/DomainObjectInvocationHandler.java    |  16 +-
 .../manager/AuthenticationManager.java             |  18 +-
 .../dom/_infra/LibraryPreloadingService.java       |   2 +-
 .../javalang/strings/vm/JavaLangStringVm.java      |   2 +-
 .../common/ui/custom/WhereInTheWorldPanel.java     |   2 +-
 .../ui/custom/WhereInTheWorldPanelFactory.java     |   2 +-
 .../authenticator/AuthenticatorSecman.java         |   4 +-
 .../TableColumnVisibilityServiceForSecman.java     |   5 +-
 .../userreg/UserRegistrationServiceForSecman.java  |   5 +-
 .../CollectionContentsAsExcelFactory.java          |   2 +-
 .../ui/components/ExcelFileModel.java              |  15 +-
 .../CalendaredCollectionFactoryAbstract.java       |   2 +-
 .../PdfJsViewerPanelComponentFactory.java          |   2 +-
 .../jpa/applib/integration/IsisEntityListener.java |   3 +-
 .../tooling/javamodel/ast/TypeDeclarations.java    |   3 +-
 .../asciidoc/applib/jaxb/AsciiDocJaxbAdapter.java  |  10 +-
 .../isis/valuetypes/asciidoc/applib/ui/Prism.java  |  27 +--
 .../valuetypes/asciidoc/applib/value/AsciiDoc.java |  41 ++--
 .../asciidoc/applib/value/Converter.java           |   7 +-
 .../metamodel/IsisModuleValAsciidocMetaModel.java  |   2 +-
 .../asciidoc/ui/vaa/components/PrismResources.java |   7 +-
 .../css/{prism1.20.css => prism1.20-default.css}   |   0
 .../resources/static/prism/css/prism1.24.1-coy.css | 221 +++++++++++++++++++++
 .../static/prism/css/prism1.24.1-default.css}      |   5 +-
 .../main/resources/static/prism/js/prism1.24.1.js  |  13 ++
 .../ui/wkt/components/prism/PrismResources.java    |   9 +-
 .../css/{prism1.20.css => prism1.20-default.css}   |   0
 .../wkt/components/prism/css/prism1.24.1-coy.css   | 221 +++++++++++++++++++++
 .../css/{prism1.20.css => prism1.24.1-default.css} |   5 +-
 .../ui/wkt/components/prism/js/prism1.24.1.js      |  13 ++
 .../common/model/components}/ComponentType.java    |  26 +--
 .../AbstractTypeFeatureReprRenderer.java           |  23 ++-
 .../wicket/model/models/ActionArgumentCache.java   |  14 +-
 .../wicket/model/models/BookmarkTreeNode.java      |  21 +-
 .../isis/viewer/wicket/ui/ComponentFactory.java    |   1 +
 .../viewer/wicket/ui/ComponentFactoryAbstract.java |  37 ++--
 .../ui/app/registry/ComponentFactoryRegistrar.java |   2 +-
 .../ui/app/registry/ComponentFactoryRegistry.java  |   2 +-
 .../ui/components/about/AboutPanelFactory.java     |   2 +-
 .../actioninfo/ActionInfoPanelFactory.java         |   2 +-
 .../serviceactions/ServiceActionsPanelFactory.java |   2 +-
 .../serviceactions/TertiaryMenuPanelFactory.java   |   2 +-
 .../actionprompt/ActionPromptHeaderPanel.java      |   2 +-
 .../components/actions/ActionParametersForm.java   |   2 +-
 .../actions/ActionParametersFormPanelFactory.java  |   2 +-
 .../components/actions/ActionParametersPanel.java  |   2 +-
 .../actions/ActionParametersPanelFactory.java      |   2 +-
 .../BookmarkedPagesPanelFactory.java               |   2 +-
 .../ui/components/collection/CollectionPanel.java  |   2 +-
 .../selector/CollectionSelectorHelper.java         |   2 +-
 .../selector/CollectionSelectorPanel.java          |   2 +-
 .../CollectionContentsAsAjaxTablePanel.java        | 155 +--------------
 .../CollectionContentsAsAjaxTablePanelFactory.java |   2 +-
 .../ajaxtable/columns/ColumnAbstract.java          |   2 +-
 .../columns/ObjectAdapterPropertyColumn.java       |   2 +-
 .../columns/ObjectAdapterTitleColumn.java          |   2 +-
 .../CollectionContentsAsIconsPanelFactory.java     |   2 +-
 .../CollectionContentsMultipleViewsPanel.java      |   2 +-
 ...ollectionContentsMultipleViewsPanelFactory.java |   2 +-
 .../CollectionContentsAsSummaryFactory.java        |   2 +-
 .../CollectionContentsHiddenPanelFactory.java      |   2 +-
 .../empty/EmptyCollectionPanelFactory.java         |   2 +-
 .../entity/EntityComponentFactoryAbstract.java     |   2 +-
 .../collection/EntityCollectionPanelFactory.java   |   2 +-
 .../components/entity/fieldset/PropertyGroup.java  |   2 +-
 .../entity/header/EntityHeaderPanel.java           |   2 +-
 .../entity/header/EntityHeaderPanelFactory.java    |   2 +-
 .../icontitle/EntityIconAndTitlePanelFactory.java  |   2 +-
 .../EntityIconTitleAndCopyLinkPanelFactory.java    |   2 +-
 .../ui/components/footer/FooterPanelFactory.java   |   2 +-
 .../wicket/ui/components/header/HeaderPanel.java   |   2 +-
 .../ui/components/header/HeaderPanelFactory.java   |   2 +-
 .../components/layout/bs3/Bs3GridPanelFactory.java |   2 +-
 .../wicket/ui/components/layout/bs3/col/Col.java   |   2 +-
 .../ui/components/property/PropertyEditForm.java   |   2 +-
 .../property/PropertyEditFormPanelFactory.java     |   2 +-
 .../ui/components/property/PropertyEditPanel.java  |   2 +-
 .../property/PropertyEditPanelFactory.java         |   2 +-
 .../PropertyEditPromptHeaderPanel.java             |   2 +-
 .../scalars/ComponentFactoryScalarAbstract.java    |   2 +-
 .../ui/components/scalars/ScalarPanelAbstract.java |   2 +-
 .../scalars/image/JavaAwtImagePanelFactory.java    |   2 +-
 .../scalars/markup/MarkupPanelFactories.java       |   2 +-
 .../scalars/reference/ReferencePanel.java          |   6 +-
 .../scalars/reference/ReferencePanelFactory.java   |   2 +-
 .../ValueChoicesSelect2PanelFactory.java           |   2 +-
 .../StandaloneCollectionPanel.java                 |   2 +-
 .../StandaloneCollectionPanelFactory.java          |   2 +-
 .../ui/components/tree/TreePanelFactories.java     |   2 +-
 .../unknown/UnknownModelPanelFactory.java          |   2 +-
 .../value/StandaloneValuePanelFactory.java         |   2 +-
 .../voidreturn/VoidReturnPanelFactory.java         |   2 +-
 .../ui/components/welcome/WelcomePanelFactory.java |   2 +-
 .../entitysimplelink/EntityLinkSimplePanel.java    |   2 +-
 .../EntityLinkSimplePanelFactory.java              |   2 +-
 .../formcomponent/FormComponentPanelAbstract.java  |   2 +-
 .../linkandlabel/LinkAndLabelFactoryAbstract.java  |   2 +-
 .../ObjectAdapterMementoProviderAbstract.java      |  19 +-
 .../isis/viewer/wicket/ui/pages/PageAbstract.java  |   4 +-
 .../viewer/wicket/ui/pages/about/AboutPage.java    |   2 +-
 .../viewer/wicket/ui/pages/entity/EntityPage.java  |   2 +-
 .../isis/viewer/wicket/ui/pages/home/HomePage.java |   2 +-
 .../StandaloneCollectionPage.java                  |   2 +-
 .../viewer/wicket/ui/pages/value/ValuePage.java    |   2 +-
 .../wicket/ui/pages/voidreturn/VoidReturnPage.java |   2 +-
 .../viewer/wicket/ui/panels/PanelAbstract.java     |   6 +-
 .../isis/viewer/wicket/ui/util/Components.java     |  10 +-
 .../wicket/ui/ComponentType_ConstantsTest.java     |   3 +
 .../ComponentFactoryRegistryDefault.java           |   2 +-
 127 files changed, 1009 insertions(+), 722 deletions(-)