This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v3 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit a4de48f09bed314710487de33bf25fb5d2ffc273 Merge: 519a5ad6b2 181b852c1b Author: andi-huber <[email protected]> AuthorDate: Sat Mar 30 11:32:14 2024 +0100 Merge remote-tracking branch 'origin/master' into v3 .../causeway/applib/graph/tree/TreeAdapter.java | 12 +- .../causeway/applib/graph/tree/TreeNode.java | 218 +++++++++++---------- .../graph/tree/TreeNode_iteratorHierarchyUp.java | 6 +- .../causeway/applib/graph/tree/TreePath.java | 154 +++++++++++++-- .../applib/graph/tree/TreePath_Default.java | 122 ------------ .../causeway/applib/graph/tree/TreeState.java | 23 ++- .../applib/graph/tree/TreeState_Default.java | 43 ---- .../commons/internal/context/_Context.java | 7 + .../metamodel/CausewayModuleCoreMetamodel.java | 2 + .../_testing/MetaModelContext_forTesting.java | 2 + .../metamodel/inspect/Object_inspectMetamodel.java | 7 +- .../metamodel/inspect/model/MMTreeAdapter.java | 6 - .../valuesemantics/TreeNodeValueSemantics.java | 24 ++- .../valuesemantics/TreePathValueSemantics.java | 137 +++++++++++++ .../docgen/help/helptree/HelpNodeVm.java | 6 +- .../docgen/help/helptree/HelpTreeAdapter.java | 6 - .../model/valuetypes/ValueTypeExample.java | 25 ++- .../tree/CausewayToWicketTreeAdapter.java | 2 +- .../ui/components/tree/_TreeModelTreeAdapter.java | 50 ++--- 19 files changed, 486 insertions(+), 366 deletions(-) diff --cc api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java index b792b1cefc,ddb372a9be..c23ea016e4 --- a/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java +++ b/api/applib/src/main/java/org/apache/causeway/applib/graph/tree/TreeNode.java @@@ -26,11 -26,8 +26,8 @@@ import java.util.Spliterators import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.inject.Named; +import jakarta.inject.Named; - import org.springframework.lang.Nullable; - import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Programmatic; import org.apache.causeway.applib.annotation.Value; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreeNodeValueSemantics.java index 361da08459,1dff074f2d..ba97291ba2 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreeNodeValueSemantics.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/valuesemantics/TreeNodeValueSemantics.java @@@ -18,12 -18,11 +18,11 @@@ */ package org.apache.causeway.core.metamodel.valuesemantics; - import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.stereotype.Component;
