(empire-db) branch master updated: EMPIREDB-422 small optimization

[doebele]

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

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new 897ff3d3 EMPIREDB-422 small optimization
897ff3d3 is described below

commit 897ff3d39c5f7b3e79f3abe3f5d50657da08916c
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Mon Apr 8 14:35:23 2024 +0200

    EMPIREDB-422
    small optimization
---
 .../java/org/apache/empire/jsf2/components/ControlTag.java  |  4 +++-
 .../java/org/apache/empire/jsf2/components/InputTag.java    |  4 +++-
 .../org/apache/empire/jsf2/utils/TagEncodingHelper.java     | 13 ++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
index 283521ea..52887087 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
@@ -611,7 +611,7 @@ public class ControlTag extends UIInput implements 
NamingContainer
         if (helper.isInsideUIData() && getChildCount()>0)
         {   // update input state
             updateControlInputState(context);
-            // Set Rendered (changed 2024-04-05)
+            // Set Rendered for children (changed 2024-04-05)
             // boolean readOnly = helper.isRecordReadOnly();
             boolean renderValue = helper.isRenderValueComponent();
             setRenderInput(!renderValue);
@@ -627,6 +627,8 @@ public class ControlTag extends UIInput implements 
NamingContainer
         if (helper.isInsideUIData() && getChildCount()>0)
         {   // update input state
             updateControlInputState(context);
+            // No need to processValidators for children
+            setRenderInput(false);
         }
         // process all validators (including children)
         super.processValidators(context);
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
index 7a8315c9..c537a149 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
@@ -277,7 +277,7 @@ public class InputTag extends UIInput implements 
NamingContainer
         if (helper.isInsideUIData() && getChildCount()>0)
         {   // update input state
             updateControlInputState(context);
-            // Set Rendered (changed 2024-04-05)
+            // Set Rendered for children (changed 2024-04-05)
             // boolean readOnly = helper.isRecordReadOnly();
             boolean renderValue = helper.isRenderValueComponent();
             setRenderInput(!renderValue);
@@ -293,6 +293,8 @@ public class InputTag extends UIInput implements 
NamingContainer
         if (helper.isInsideUIData() && getChildCount()>0)
         {   // update input state
             updateControlInputState(context);
+            // No need to processValidators for children
+            setRenderInput(false);
         }
         // process all validators (including children)
         super.processValidators(context);
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index d714409d..ee8066ac 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -927,7 +927,9 @@ public class TagEncodingHelper implements NamingContainer
     {
         // component 
         if (!(component instanceof UIInput))
-        {   log.info("Component for {} is not of type UIInput", 
getColumn().getName());
+        {   // from LabelTag ?
+            if (!(component instanceof LabelTag))
+                log.warn("Component for {} is not of type UIInput but {}", 
getColumn().getName(), component.getClass().getName());
             return true;
         }
         // Check Record
@@ -1919,18 +1921,11 @@ public class TagEncodingHelper implements 
NamingContainer
         if (comp==null || comp.getId()==null)
             return;
         if (isInsideUIData()) 
-        {
+        {   // reset component-id
             String resetId = comp.getId();
             if (log.isInfoEnabled())
                 log.info("Resetting Component-id inside UIData to {}", 
resetId);
             comp.setId(resetId);
-            
-            /* needed ? 
-            for (UIComponent c : comp.getChildren())
-            {
-                resetComponentId(c);
-            }
-            */
         }
     }