This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 6957916b5bd8101c5f92dd42a6bc1b5a7af02ed4 Merge: ed3bd76ba0c 5ba1bce8d79 Author: Andi Huber <[email protected]> AuthorDate: Sat Oct 25 21:58:59 2025 +0200 Merge pull request #3187 from apache/3913-grid.fixes CAUSEWAY-3913 Layout Fixes api/applib/src/main/java/module-info.java | 1 + .../applib/layout/component/ActionLayoutData.java | 176 ++-------- .../layout/component/ActionLayoutDataOwner.java | 1 - .../layout/component/CollectionLayoutData.java | 194 +++-------- .../layout/component/DomainObjectLayoutData.java | 162 ++------- .../causeway/applib/layout/component/FieldSet.java | 134 ++------ .../applib/layout/component/HasBookmarking.java | 4 +- .../applib/layout/component/HasCssClass.java | 4 +- .../applib/layout/component/HasCssClassFa.java | 4 - .../applib/layout/component/HasDescribedAs.java | 3 - .../applib/layout/component/HasHidden.java | 3 - .../causeway/applib/layout/component/HasNamed.java | 3 - .../layout/component/PropertyLayoutData.java | 206 +++--------- .../layout/component/ServiceActionLayoutData.java | 164 +++------- .../component/ServiceActionLayoutDataOwner.java | 1 - .../apache/causeway/applib/layout/grid/Grid.java | 81 ++--- .../causeway/applib/layout/grid/GridAbstract.java | 210 ------------ .../applib/layout/grid/bootstrap/BSClearFix.java | 3 +- .../layout/grid/bootstrap/BSClearFixHidden.java | 16 +- .../layout/grid/bootstrap/BSClearFixVisible.java | 29 +- .../applib/layout/grid/bootstrap/BSCol.java | 195 +++-------- .../applib/layout/grid/bootstrap/BSElement.java | 24 +- .../layout/grid/bootstrap/BSElementAbstract.java | 22 +- .../bootstrap/BSElementOwnerResolvingWalker.java | 107 ++++++ .../applib/layout/grid/bootstrap/BSGrid.java | 272 +++------------- .../layout/grid/bootstrap/BSGridTransformer.java | 175 ++++++++++ .../applib/layout/grid/bootstrap/BSRow.java | 87 ++--- .../applib/layout/grid/bootstrap/BSRowContent.java | 46 +-- .../layout/grid/bootstrap/BSRowContentOwner.java | 6 +- .../applib/layout/grid/bootstrap/BSRowOwner.java | 2 +- .../applib/layout/grid/bootstrap/BSTab.java | 142 +------- .../applib/layout/grid/bootstrap/BSTabGroup.java | 92 ++---- .../layout/grid/bootstrap/BSTabGroupOwner.java | 3 +- .../applib/layout/grid/bootstrap/BSTabOwner.java | 3 +- .../applib/layout/grid/bootstrap/BSUtil.java | 115 +++++++ .../applib/layout/grid/bootstrap/BSWalker.java | 159 +++++++++ .../bootstrap/{HasCssId.java => HasElementId.java} | 2 +- .../applib/layout/grid/bootstrap/WithinGrid.java | 30 -- .../applib/layout/menubars/MenuBarsAbstract.java | 1 + .../applib/layout/menubars/bootstrap/BSMenu.java | 71 ++-- .../layout/menubars/bootstrap/BSMenuBar.java | 33 +- .../layout/menubars/bootstrap/BSMenuBars.java | 70 ++-- .../layout/menubars/bootstrap/BSMenuSection.java | 44 +-- .../applib/services/grid/GridLoaderService.java | 7 +- .../GridMarshaller.java} | 18 +- .../services/grid/GridMarshallerService.java | 31 -- .../causeway/applib/services/grid/GridService.java | 2 +- .../{MarshallerService.java => Marshaller.java} | 5 +- .../services/menu/MenuBarsMarshallerService.java | 4 +- .../causeway/commons/internal/os/_OsUtil.java | 3 +- .../commons/internal/testing/_DocumentTester.java | 28 +- .../org/apache/causeway/commons/io/JaxbUtils.java | 53 ++- .../metamodel/CausewayModuleCoreMetamodel.java | 6 +- .../{GridFacetDefault.java => BSGridFacet.java} | 94 +++--- .../metamodel/facets/object/grid/GridFacet.java | 3 +- .../facets/object/grid/GridFacetFactory.java | 45 ++- .../interactions/managed/ManagedCollection.java | 2 +- .../interactions/managed/ManagedProperty.java | 2 +- .../core/metamodel/layout/LayoutFacetUtil.java | 2 +- .../services/grid/GridLoaderServiceDefault.java | 9 +- .../services/grid/GridServiceDefault.java | 119 +------ .../services/grid/GridSystemServiceAbstract.java | 29 +- .../grid/XsiSchemaLocationProviderForGrid.java | 80 +++++ .../grid/bootstrap/CollapseIfOneTabProcessor.java | 56 ---- .../grid/bootstrap/EmptyTabRemovalProcessor.java | 73 ----- .../grid/bootstrap/GridInitializationModel.java | 289 ++++++++++++++++ .../bootstrap/GridMarshallerServiceBootstrap.java | 54 +-- .../grid/bootstrap/GridSystemServiceBootstrap.java | 197 ++++++----- .../services/grid/bootstrap/_GridModel.java | 253 -------------- .../core/metamodel/spec/feature/ObjectAction.java | 12 +- .../metamodel/spec/impl/_MembersAsColumns.java | 7 +- .../causeway/core/metamodel/util/Facets.java | 4 +- .../services/grid/GridXmlRoundtripTest.java | 32 +- .../mmtestsupport/MetaModelContext_forTesting.java | 34 +- .../bootstrap/BSMenuBarsAttributesAppender.java | 57 ++++ .../MenuBarsMarshallerServiceBootstrap.java | 9 +- .../bootstrap/MenuBarsServiceBootstrap.java | 35 +- .../sitemap/SitemapServiceDefault.java | 6 +- .../help/topics/welcome/WelcomeHelpPage.java | 82 ++--- ...hPdfJsViewer_IntegTest.dump_facets.approved.xml | 21 +- ..._MixinDomain_IntegTest.dump_facets.approved.xml | 21 +- ...hPdfjsViewer_IntegTest.dump_facets.approved.xml | 2 +- ...r_PropDomain_IntegTest.dump_facets.approved.xml | 2 +- .../MetaModelRegressionTest.verify.approved.xml | 362 +++++---------------- .../viewer/commons/model/layout/UiGridLayout.java | 26 +- .../viewer/controller/ResourceController.java | 35 +- .../resources/DomainObjectResourceServerside.java | 4 +- .../resources/DomainTypeResourceServerside.java | 2 +- .../serviceactions/MenuActionPanel.java | 4 +- .../components/layout/bs/BSGridPanelFactory.java | 14 +- .../wicket/ui/components/layout/bs/col/Col.java | 7 +- .../wicket/ui/components/layout/bs/row/Row.java | 2 +- .../components/layout/bs/tabs/TabGroupPanel.java | 3 +- .../components/object/fieldset/PropertyGroup.java | 6 +- 94 files changed, 2069 insertions(+), 3284 deletions(-)
