This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch pre-merge
in repository https://gitbox.apache.org/repos/asf/causeway.git
from ab5c8a60c1 Merge branch 'maintenance-branch' into pre-merge
add d7574d5afa Merge pull request #2513 from apache/pre-merge
add b5a64acd5c CAUSEWAY-3789 output array's values instead of memory
address
add 6b3d1f03bc Merge pull request #2514 from
dk2k/CAUSEWAY-3789_output_array
add 1115201cbc CAUSEWAY-3789: removes need for boolean ref var (code
quality)
add a3d5761f46 CAUSEWAY-3793: allow Sortable Column Indicator to be turned
off
add 9b2cff61e3 CAUSEWAY-3793: sort icon CSS fix
add ca917af6ca CAUSEWAY-3793: CollectionContentsAsAjaxTablePanel deserves
its own CSS file
add 29083f4252 CAUSEWAY-3792: fixes internal 'long' parsing
add 2504b44751 Merge pull request #2516 from apache/pre-merge
add 77105e0e0e Merge pull request #2517 from apache/pre-merge
add ce6ca0488c Merge pull request #2518 from apache/pre-merge
add 05f8bf09d3 Merge pull request #2519 from apache/pre-merge
add d823a9dc83 CAUSEWAY-3705: updates menu to reference titlecache
add d259a4204f CAUSEWAY-3705: further minor doc improvement
add aa8d79a583 Bump org.apache.maven.plugins:maven-dependency-plugin
add 0deb14bc18 Merge pull request #2520 from
apache/dependabot/maven/master/org.apache.maven.plugins-maven-dependency-plugin-3.7.1
add 0e3e7b6b7e Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.2
to 3.4.0
add a94eef8ed1 Merge pull request #2525 from
apache/dependabot/maven/master/org.apache.maven.plugins-maven-clean-plugin-3.4.0
add 89fc8a7cf2 Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1
to 3.4.2
add bcdd5dc630 Merge pull request #2523 from
apache/dependabot/maven/master/org.apache.maven.plugins-maven-jar-plugin-3.4.2
add 9900f17cb5 Bump org.apache.maven.plugins:maven-scm-publish-plugin
add 6c6c468740 Merge pull request #2522 from
apache/dependabot/maven/master/org.apache.maven.plugins-maven-scm-publish-plugin-3.3.0
add ae8dc80ead Bump com.fasterxml.woodstox:woodstox-core from 6.6.2 to
7.0.0
add 51fbc5dc7e Merge pull request #2524 from
apache/dependabot/maven/master/com.fasterxml.woodstox-woodstox-core-7.0.0
add 6ad8b35ebf Bump org.springframework.graphql:spring-graphql-test from
1.3.0 to 1.3.1
add 32a30b5e66 Merge pull request #2521 from
apache/dependabot/maven/master/org.springframework.graphql-spring-graphql-test-1.3.1
add fa110026f9 Merge pull request #2532 from apache/pre-merge
add 58a833c4f3 CAUSEWAY-3799: ensures that PropertyChangeRecord and
PropertyChangeRecordId are both comparable also
add 9a549f0105 CAUSEWAY-3799: ensures Can of Property changes holds only
unique values
add ad59abc158 CAUSEWAY-3799: makes EntityPropertyChange implement
Comparable and hashcode etc
add 251302bcc0 CAUSEWAY-3799: moves the writing out of audit trail entries
add 068ee03987 CAUSEWAY-3799: introduces DeadlockRecognizer so that audit
...
add 20a121aef1 CAUSEWAY-3799: uses DeadlockRecognizer in the retry logic
of RunBackgroundCommandsJob also
add 35e015d34e CAUSEWAY-3799: removes unnecessary passing of Command into
InteractionInternal
add 5c2764a9bd CAUSEWAY-3799: reduces duplicate logging in
CausewayInteraction if a deadlock has been hit
add 647d557a6a CAUSEWAY-3799: adds a guard to attempt to forestall changes
being made
add 59eaeb2bf4 CAUSEWAY-3799: in
InteractionServiceDefault#preInteractionClosed, do make sure we close down the
interaction
add 56954d6e5e Merge branch 'CAUSEWAY-3799' into maintenance-branch
new 2f8a3f236f Merge branch 'maintenance-branch' into pre-merge
add 8f16a73752 CAUSEWAY-3794: refactor table components into their own
packages (separation of concerns)
add 2d2c045248 CAUSEWAY-3794: more encapsulation; also renaming
encapsulated classes
add e90a4880fe CAUSEWAY-3794: make Wkt#addIfElseHide more broadly usable
add 869d52dd06 CAUSEWAY-3794: separate out table hinting concerns
add 38cf220c9a CAUSEWAY-3794: renames component id as well (build fix)
add 4d987045a0 CAUSEWAY-3794: encapsulates all hinting stuff within the
owning component
add 16f7c3cd64 CAUSEWAY-3794: completes the encapsulation for table
components
add f4f691a1b7 CAUSEWAY-3794: pagesize select UI mock-up
add db6aa4ba98 CAUSEWAY-3794: generalize
add 7a01645831 CAUSEWAY-3794: wire up page-size choice with hinting system
add 38c04ff921 CAUSEWAY-3794: adds page-size chooser to no-nav toolbar as
well
add 0195847702 CAUSEWAY-3794: render page-size select as drop-down button
add b37bd7a8b8 CAUSEWAY-3794: drop-down button CSS fix (some margin right)
add 690fe239f7 CAUSEWAY-3794: shorter names for child components
add 95bb8acbed CAUSEWAY-3794: work on hints
add b7911580e5 CAUSEWAY-3794: reinstate item reuse strategy
add 512b8e236a CAUSEWAY-3794: moves responsibility to provide pagesize
choices to table model
add 576cb2753e CAUSEWAY-3794: adds checkmark to selected page-size choice
add 97f3f362ff CAUSEWAY-3794: disable selected link in choices dropdown
add cfd76c26bb CAUSEWAY-3794: remove show-all link
add f9af1cec79 CAUSEWAY-3794: page-size hinting fix
add f9332e2bee CAUSEWAY-3794: search-arg hinting fix
add 69dc938c9b Merge pull request #2515 from apache/3794.table.pagesize.sel
add a93232d5bc CAUSEWAY-2297: remove unused imports (prepare for v3 merge)
add bc45ac51eb CAUSEWAY-3791: Non-ascii char in the name of variable in
class _Images
add 5152409deb CAUSEWAY-3790: fixes invalid use of equals in
ConsentAbstract
add e35f8bf139 CAUSEWAY-3797: offer column sorting only if underlying
class is comparable
add 3e236472cd CAUSEWAY-3797: fixes prev. commit (potential NPE)
add e5063398f4 CAUSEWAY-3797: HeadersToolbar: remove superfluous override
add b157961e02 CAUSEWAY-3798: fixes page-size hinting, when table is
initially 'hidden'
add bb872a0869 CAUSEWAY-3794: minor: change page-size choices (ordering
and smallest value)
add 356e72ea92 CAUSEWAY-3797: allows sorting for primitives, strings and
enums
new e03daa57d6 Merge branch 'master' into pre-merge
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ROOT/partials/module-nav/extensions.adoc | 1 +
.../publishing/log/PageRenderCollectionLogger.java | 6 +-
.../log/PageRenderDomainObjectLogger.java | 15 +-
.../publishing/log/PageRenderValueLogger.java | 21 +-
.../publishing/spi/EntityPropertyChange.java | 82 ++++++--
bom/pom.xml | 10 +-
.../causeway/commons/collections/Can_Multiple.java | 2 +-
.../causeway/commons/internal/image/_Images.java | 1 -
.../commons/internal/primitives/_Longs.java | 18 +-
core/config/src/main/java/module-info.java | 2 +-
.../core/config/CausewayConfiguration.java | 11 +-
.../interaction/session/CausewayInteraction.java | 60 +++---
core/metamodel/src/main/java/module-info.java | 1 +
.../core/metamodel/consent/ConsentAbstract.java | 5 +-
.../core/metamodel/execution/ActionExecutor.java | 8 +-
.../metamodel/execution/InteractionInternal.java | 23 ++-
.../services/deadlock/DeadlockRecognizer.java | 33 ++-
.../objectlifecycle/PropertyChangeRecord.java | 30 ++-
.../objectlifecycle/PropertyChangeRecordId.java | 11 +-
.../core/metamodel/spec/ObjectSpecification.java | 12 ++
.../specloader/specimpl/ObjectActionMixedIn.java | 9 +-
.../core/metamodel/util/snapshot/XmlSnapshot.java | 23 ++-
.../command/CommandExecutorServiceDefault.java | 23 +--
.../executor/MemberExecutorServiceDefault.java | 14 +-
.../EntityPropertyChangePublisherDefault.java | 26 ++-
.../session/InteractionServiceDefault.java | 100 +++++++--
.../transaction/TransactionServiceSpring.java | 39 ++--
.../applib/job/RunBackgroundCommandsJob.java | 15 +-
.../adoc/modules/titlecache/pages/about.adoc | 2 +-
.../commons/CausewayModulePersistenceCommons.java | 5 +
.../changetracking/EntityChangeTrackerDefault.java | 40 +++-
.../changetracking/_ChangingEntitiesFactory.java | 18 --
.../deadlock/DeadlockRecognizerDefault.java | 52 +++++
viewers/graphql/testsupport/pom.xml | 2 +-
.../CausewayRestfulObjectsInteractionFilter.java | 2 +-
.../wicket/model/src/main/java/module-info.java | 5 +-
.../itemreuse/ReuseIfRowIndexEqualsStrategy.java | 117 +++++++++++
.../models/EntityCollectionModelAbstract.java | 9 +
.../model/models/EntityCollectionModelHidden.java | 5 -
.../PagesizeChoice.java} | 38 +---
.../wicket/model/timetaken}/TimeTakenModel.java | 6 +-
.../ajaxtable/CausewayAjaxDataTable.java | 224 ---------------------
.../ajaxtable/CausewayAjaxNavigationToolbar.java | 117 -----------
.../CollectionContentsAsAjaxTablePanel.css | 192 ++++++++++++++++++
.../CollectionContentsAsAjaxTablePanel.html | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 37 ++--
.../columns/AssociationColumnAbstract.java | 10 +-
.../ajaxtable/columns/PluralColumn.java | 5 +-
.../ajaxtable/columns/SingularColumn.java | 2 +-
.../ajaxtable/images/arrow_down.png | Bin 189 -> 0 bytes
.../ajaxtable/images/arrow_off.png | Bin 178 -> 0 bytes
.../ajaxtable/images/arrow_up.png | Bin 189 -> 0 bytes
.../ui/components/table/CausewayAjaxDataTable.java | 103 ++++++++++
.../table/DataTableWithPagesAndFilter.java | 188 +++++++++++++++++
.../filter/FilterToolbar.html} | 2 +-
.../filter/FilterToolbar.java} | 52 +++--
.../head/HeadersToolbar.html} | 3 +-
.../head/HeadersToolbar.java} | 38 ++--
.../head/HeadersToolbarAbstract.java} | 55 ++---
.../head/OrderByBorder.java} | 19 +-
.../ui/components/table/internal/_TableUtils.java | 31 ++-
.../nav/NavigationToolbar.html} | 2 +-
.../ui/components/table/nav/NavigationToolbar.java | 78 +++++++
.../nav/pagesize/PagesizeChooser.html} | 33 +--
.../table/nav/pagesize/PagesizeChooser.java | 111 ++++++++++
.../nav/paging/Navigation.java} | 13 +-
.../nav/paging/NavigationIncrementLink.java} | 19 +-
.../nav/paging/NavigationLink.java} | 23 +--
.../nav/paging/PageNavigator.java} | 25 +--
.../nonav/TotalRecordsToolbar.html} | 1 +
.../nonav/TotalRecordsToolbar.java} | 48 ++---
.../bootstrap/css/bootstrap-overrides-all-v2.css | 168 ----------------
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 29 ++-
73 files changed, 1518 insertions(+), 1014 deletions(-)
copy
persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_ChangingEntitiesFactory.java
=>
core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/deadlock/DeadlockRecognizer.java
(52%)
create mode 100644
persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/deadlock/DeadlockRecognizerDefault.java
create mode 100644
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/itemreuse/ReuseIfRowIndexEqualsStrategy.java
copy
viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/{models/EntityCollectionModelHidden.java
=> pagesize/PagesizeChoice.java} (52%)
rename
viewers/wicket/{ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable
=>
model/src/main/java/org/apache/causeway/viewer/wicket/model/timetaken}/TimeTakenModel.java
(91%)
delete mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxDataTable.java
delete mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CausewayAjaxNavigationToolbar.java
create mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
delete mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_down.png
delete mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_off.png
delete mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/images/arrow_up.png
create mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/CausewayAjaxDataTable.java
create mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/SearchBar.html
=> table/filter/FilterToolbar.html} (95%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/SearchBar.java
=> table/filter/FilterToolbar.java} (69%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxHeadersToolbar.html
=> table/head/HeadersToolbar.html} (85%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxHeadersToolbar.java
=> table/head/HeadersToolbar.java} (72%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxHeadersToolbarAbstract.java
=> table/head/HeadersToolbarAbstract.java} (81%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxFallbackOrderByBorder.java
=> table/head/OrderByBorder.java} (84%)
copy
persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/changetracking/_ChangingEntitiesFactory.java
=>
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/internal/_TableUtils.java
(51%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxNavigationToolbar.html
=> table/nav/NavigationToolbar.html} (92%)
create mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/NavigationToolbar.java
copy
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
=> table/nav/pagesize/PagesizeChooser.html} (56%)
create mode 100644
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/pagesize/PagesizeChooser.java
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxPagingNavigation.java
=> table/nav/paging/Navigation.java} (77%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxPagingNavigationIncrementLink.java
=> table/nav/paging/NavigationIncrementLink.java} (67%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxPagingNavigationLink.java
=> table/nav/paging/NavigationLink.java} (70%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayAjaxPagingNavigator.java
=> table/nav/paging/PageNavigator.java} (61%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayTotalRecordsToolbar.html
=> table/nonav/TotalRecordsToolbar.html} (92%)
rename
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{collectioncontents/ajaxtable/CausewayTotalRecordsToolbar.java
=> table/nonav/TotalRecordsToolbar.java} (64%)
