(tapestry-5) 01/02: Fixing Tree component tests

[thiagohp]

This is an automated email from the ASF dual-hosted git repository.

thiagohp pushed a commit to branch feature/requirejs-less
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git

commit 7132184d80464d750231ab85771b3da53a5e441f
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Thu Aug 7 19:41:26 2025 -0300

    Fixing Tree component tests
---
 .../apache/tapestry5/corelib/components/Tree.java  | 36 +++++++++++++++++-----
 .../apache/tapestry5/corelib/components/Zone.java  | 15 +++++++--
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git 
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java 
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java
index 7167574a4..a7a670236 100644
--- 
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java
+++ 
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Tree.java
@@ -12,13 +12,25 @@
 
 package org.apache.tapestry5.corelib.components;
 
-import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.*;
+import java.util.List;
+
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Events;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.RequestParameter;
 import org.apache.tapestry5.dom.Element;
 import org.apache.tapestry5.func.F;
 import org.apache.tapestry5.func.Flow;
 import org.apache.tapestry5.func.Worker;
 import org.apache.tapestry5.http.Link;
+import org.apache.tapestry5.internal.services.ajax.RequireJsModeHelper;
 import org.apache.tapestry5.internal.util.CaptureResultCallback;
 import org.apache.tapestry5.ioc.annotations.Inject;
 import org.apache.tapestry5.json.JSONObject;
@@ -26,9 +38,11 @@ import org.apache.tapestry5.runtime.RenderCommand;
 import org.apache.tapestry5.runtime.RenderQueue;
 import org.apache.tapestry5.services.Heartbeat;
 import org.apache.tapestry5.services.javascript.JavaScriptSupport;
-import org.apache.tapestry5.tree.*;
-
-import java.util.List;
+import org.apache.tapestry5.tree.DefaultTreeExpansionModel;
+import org.apache.tapestry5.tree.TreeExpansionModel;
+import org.apache.tapestry5.tree.TreeModel;
+import org.apache.tapestry5.tree.TreeNode;
+import org.apache.tapestry5.tree.TreeSelectionModel;
 
 /**
  * A component used to render a recursive tree structure, with 
expandable/collapsable/selectable nodes. The data that is displayed
@@ -45,9 +59,8 @@ import java.util.List;
  * @since 5.3
  */
 @SuppressWarnings(
-        {"rawtypes", "unchecked", "unused"})
+        {"rawtypes", "unchecked"})
 @Events({EventConstants.NODE_SELECTED, EventConstants.NODE_UNSELECTED})
-@Import(module = "t5/core/tree")
 public class Tree
 {
     /**
@@ -143,6 +156,14 @@ public class Tree
 
     @Environmental
     private Heartbeat heartbeat;
+    
+    @Inject
+    private RequireJsModeHelper requireJsModeHelper;
+    
+    void beginRender()
+    {
+        requireJsModeHelper.importModule("t5/core/tree");
+    }
 
     /**
      * Renders a single node (which may be the last within its containing 
node).
@@ -160,6 +181,7 @@ public class Tree
     {
         return new RenderCommand()
         {
+            @SuppressWarnings("deprecation")
             public void render(MarkupWriter writer, RenderQueue queue)
             {
                 // Inform the component's container about what value is being 
rendered
diff --git 
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java 
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
index 7bfd9b720..276cf8d82 100644
--- 
a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
+++ 
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
@@ -12,9 +12,18 @@
 
 package org.apache.tapestry5.corelib.components;
 
-import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.*;
-import org.apache.tapestry5.beanmodel.services.*;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ClientBodyElement;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.QueryParameterConstants;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.annotations.BeginRender;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
 import org.apache.tapestry5.corelib.internal.ComponentActionSink;
 import org.apache.tapestry5.corelib.internal.FormSupportAdapter;
 import org.apache.tapestry5.corelib.internal.HiddenFieldPositioner;