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 c6767fd74702a7ac1383f3bb4f258e4346d6d247 Merge: 218162de5f 9d22606c7d Author: Andi Huber <[email protected]> AuthorDate: Mon Sep 5 14:45:57 2022 +0200 Merge pull request #1081 from apache/3199_mm.refactor ISIS-3199: Metamodel/Core Refactoring/Cleanup .../{MessageBroker.java => MessageBrokerImpl.java} | 19 ++- .../_testing/MetaModelContext_forTesting.java | 11 ++ .../_testing/ObjectMementoService_forTesting.java | 8 -- .../metamodel/context/HasMetaModelContext.java | 72 ++++++++-- .../core/metamodel/context/MetaModelContext.java | 91 +----------- ...gIoc.java => MetaModelContext_usingSpring.java} | 23 ++- .../core/metamodel/context/MetaModelContexts.java | 2 +- .../isis/core/metamodel/object/Bookmarkable.java | 5 + .../isis/core/metamodel/object/ManagedObject.java | 11 +- .../metamodel/objectmanager/ObjectManager.java | 3 + .../memento/ObjectMementoService.java | 3 - .../metamodel/services/message/MessageBroker.java | 34 ++--- .../core/runtime/context/IsisAppCommonContext.java | 156 --------------------- .../memento/ObjectMementoServiceDefault.java | 7 - .../message/MessageServiceDefault.java | 2 +- .../isis/core/webapp/IsisModuleCoreWebapp.java | 5 +- .../wkt/viewer/EventProviderAbstract.java | 8 +- .../wkt/viewer/FullCalendarWithEventHandling.java | 11 +- .../ListeningMarkupPanelFactoriesForWicket.java | 4 +- .../viewer/vaadin/model/decorator/Decorators.java | 4 +- .../vaadin/ui/auth/AuthSessionStoreUtil.java | 3 +- .../vaadin/ui/components/blob/BlobField.java | 4 +- .../vaadin/ui/components/clob/ClobField.java | 4 +- .../vaadin/ui/components/markup/MarkupField.java | 4 +- .../vaadin/ui/components/temporal/DateField.java | 4 +- .../viewer/vaadin/ui/pages/main/MainViewVaa.java | 11 +- .../ui/pages/main/MainView_createHeader.java | 6 +- .../vaadin/ui/pages/main/MenuBuilderVaa.java | 4 +- .../viewers/common/wkt/InteractionTestWkt.java | 4 +- .../testdomain/conf/Configuration_usingWicket.java | 56 ++++---- .../tooling/javamodel/test/ProjectSamples.java | 2 +- .../wicket/model/modelhelpers/WhereAmIHelper.java | 10 +- .../viewer/wicket/model/models/AboutModel.java | 7 +- .../wicket/model/models/ActionModelImpl.java | 6 +- .../wicket/model/models/BookmarkedPagesModel.java | 6 +- .../wicket/model/models/ChainingObjectModel.java | 6 +- .../wicket/model/models/CommonContextModel.java | 10 +- .../wicket/model/models/EntityCollectionModel.java | 4 +- .../models/EntityCollectionModelAbstract.java | 6 +- .../models/EntityCollectionModelStandalone.java | 2 +- .../viewer/wicket/model/models/EntityModel.java | 18 +-- .../wicket/model/models/FormExecutorContext.java | 4 +- .../wicket/model/models/ManagedObjectModel.java | 20 +-- .../viewer/wicket/model/models/ModelAbstract.java | 17 ++- .../wicket/model/models/ObjectAdapterModel.java | 4 +- .../wicket/model/models/ScalarConvertingModel.java | 2 +- .../wicket/model/models/ScalarModelWithChoice.java | 12 +- .../model/models/ScalarModelWithMultiChoice.java | 18 +-- .../model/models/ScalarModelWithSingleChoice.java | 5 +- .../wicket/model/models/ScalarParameterModel.java | 8 +- .../wicket/model/models/ScalarPropertyModel.java | 8 +- .../wicket/model/models/ScalarUnwrappingModel.java | 2 +- .../wicket/model/models/ServiceActionsModel.java | 5 +- .../viewer/wicket/model/models/ValueModel.java | 12 +- .../isis/viewer/wicket/model/models/VoidModel.java | 5 +- .../viewer/wicket/model/models/WelcomeModel.java | 7 +- .../models/interaction/BookmarkedObjectWkt.java | 12 +- .../interaction/act/ParameterUiModelWkt.java | 10 +- .../interaction/prop/PropertyUiModelWkt.java | 10 +- .../viewer/wicket/model/util/ComponentHintKey.java | 8 +- .../wicket/model/util/PageParameterUtils.java | 2 +- .../isis/viewer/wicket/model/util/WktContext.java | 22 ++- .../model/value/ValueSemanticsModelAbstract.java | 10 +- .../wicket/model/models/EntityModel_hintsTest.java | 11 +- .../viewer/wicket/ui/ComponentFactoryAbstract.java | 4 +- .../ActionResultResponseHandlingStrategy.java | 14 +- .../actionresponse/ActionResultResponseType.java | 18 +-- .../wicket/ui/app/logout/LogoutHandlerWkt.java | 2 +- .../viewer/wicket/ui/components/LabelBase.java | 12 +- .../wicket/ui/components/WebComponentBase.java | 12 +- .../wicket/ui/components/about/AboutPanel.java | 2 +- .../ui/components/about/AboutPanelFactory.java | 2 +- .../ui/components/about/JarManifestModel.java | 28 ++-- .../actionmenu/serviceactions/CssMenuItem.java | 2 +- .../actionmenu/serviceactions/MenuActionPanel.java | 4 +- .../serviceactions/ServiceActionUtil.java | 10 +- .../serviceactions/ServiceActionsPanelFactory.java | 2 +- .../serviceactions/TertiaryMenuPanelFactory.java | 2 +- .../bookmarkedpages/BookmarkedPagesPanel.java | 2 +- .../ui/components/collection/CollectionPanel.java | 2 +- .../CollectionContentsAsAjaxTablePanel.java | 4 +- .../ajaxtable/PrototypingMessageProvider.java | 6 +- .../ajaxtable/columns/GenericColumnAbstract.java | 10 +- .../ajaxtable/columns/GenericPropertyColumn.java | 6 +- .../ajaxtable/columns/GenericTitleColumn.java | 8 +- .../ajaxtable/columns/GenericToggleboxColumn.java | 4 +- .../icons/CollectionContentsAsIconsPanel.java | 2 +- .../CollectionContentsMultipleViewsPanel.java | 2 +- .../entity/collection/EntityCollectionPanel.java | 2 +- .../wicket/ui/components/footer/FooterPanel.java | 8 +- .../wicket/ui/components/header/HeaderPanel.java | 2 +- .../ui/components/layout/bs/BSGridPanel.java | 2 +- .../wicket/ui/components/layout/bs/col/Col.java | 2 +- .../wicket/ui/components/layout/bs/row/Row.java | 2 +- .../components/layout/bs/tabs/TabGroupPanel.java | 5 +- .../ui/components/layout/bs/tabs/TabPanel.java | 2 +- .../PropertyEditPromptHeaderPanel.java | 2 +- .../components/scalars/ScalarPanelAbstract2.java | 3 +- .../viewer/wicket/ui/components/scalars/_Util.java | 5 +- .../datepicker/TextFieldWithDateTimePicker.java | 11 +- .../components/tree/IsisToWicketTreeAdapter.java | 30 ++-- .../ui/components/welcome/WelcomePanelFactory.java | 2 +- .../widgets/breadcrumbs/BreadcrumbModel.java | 6 +- .../widgets/breadcrumbs/BreadcrumbPanel.java | 15 +- .../entitysimplelink/EntityLinkSimplePanel.java | 14 +- .../widgets/linkandlabel/ActionLink.java | 12 +- .../linkandlabel/LinkAndLabelFactoryAbstract.java | 2 +- .../ui/components/widgets/select2/Select2.java | 12 +- .../select2/providers/ChoiceProviderAbstract.java | 15 +- .../ChoiceProviderAbstractForScalarModel.java | 7 +- .../providers/ChoiceProviderForReferences.java | 14 +- .../select2/providers/ChoiceProviderForValues.java | 3 +- .../widgets/themepicker/ThemeChooser.java | 4 +- .../viewer/wicket/ui/errors/ExceptionModel.java | 18 +-- .../viewer/wicket/ui/errors/JGrowlBehaviour.java | 24 ++-- .../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 2 +- .../isis/viewer/wicket/ui/pages/PageAbstract.java | 24 ++-- .../isis/viewer/wicket/ui/pages/WebPageBase.java | 33 +++-- .../accmngt/AccountManagementPageAbstract.java | 8 +- .../ui/pages/accmngt/EmailAvailableValidator.java | 12 +- .../accmngt/SuccessFeedbackCookieManager.java | 3 +- .../pages/accmngt/UsernameAvailableValidator.java | 10 +- .../password_reset/PasswordResetEmailPanel.java | 4 +- .../accmngt/password_reset/PasswordResetPage.java | 2 +- .../accmngt/password_reset/PasswordResetPanel.java | 2 +- .../ui/pages/accmngt/register/RegisterPanel.java | 2 +- .../pages/accmngt/signup/RegistrationFormPage.java | 2 +- .../accmngt/signup/RegistrationFormPanel.java | 4 +- .../viewer/wicket/ui/pages/entity/EntityPage.java | 6 +- .../viewer/wicket/ui/pages/error/ErrorPage.java | 2 +- .../isis/viewer/wicket/ui/pages/home/HomePage.java | 6 +- .../wicket/ui/pages/login/SignInPanelAbstract.java | 10 +- .../wicket/ui/pages/login/WicketSignInPage.java | 8 +- .../wicket/ui/pages/mmverror/MmvErrorPage.java | 8 +- .../isis/viewer/wicket/ui/panels/FormAbstract.java | 31 ++-- .../wicket/ui/panels/FormExecutorDefault.java | 31 ++-- .../isis/viewer/wicket/ui/panels/OkCancelForm.java | 4 +- .../viewer/wicket/ui/panels/PanelAbstract.java | 3 +- .../isis/viewer/wicket/ui/panels/PanelBase.java | 41 ++---- .../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 9 +- .../isis/viewer/wicket/ui/util/WktDecorators.java | 4 +- .../viewer/wicket/ui/validation/ValidatorBase.java | 12 +- .../ui/ComponentFactoryAbstractTest_init.java | 32 ++--- .../choices/ChoiceProviderForReferencesTest.java | 5 +- .../choices/ChoiceProviderForValuesTest.java | 5 +- .../choices/ChoiceProviderTestAbstract.java | 3 +- .../AuthenticatedWebSessionForIsis.java | 30 ++-- .../viewer/integration/WebRequestCycleForIsis.java | 44 +++--- .../ComponentFactoryRegistryDefault.java | 7 +- .../IsisWicketAjaxRequestListenerUtil.java | 4 +- .../viewer/wicketapp/IsisWicketApplication.java | 15 +- .../wicket/viewer/wicketapp/_PageFactory.java | 6 +- ...uthenticatedWebSessionForIsis_Authenticate.java | 35 ++--- .../AuthenticatedWebSessionForIsis_SignIn.java | 23 ++- ...uthenticatedWebSessionForIsis_TestAbstract.java | 8 +- .../wicketapp/IsisWicketApplication_Defaults.java | 6 +- .../wicketapp/IsisWicketApplication_Pages.java | 2 +- 157 files changed, 769 insertions(+), 993 deletions(-)
