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 d27b3ed0 EMPIREDB-456: SelectTag: avoid doubling of component-id d27b3ed0 is described below commit d27b3ed01a630c547c6c900c74e3abeadc6e0114 Author: Rainer Döbele <doeb...@apache.org> AuthorDate: Wed Jun 18 14:15:30 2025 +0200 EMPIREDB-456: SelectTag: avoid doubling of component-id --- .../main/java/org/apache/empire/jakarta/components/SelectTag.java | 7 +++++-- .../src/main/java/org/apache/empire/jsf2/components/SelectTag.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/SelectTag.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/SelectTag.java index b2a97546..1b777db6 100644 --- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/SelectTag.java +++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/SelectTag.java @@ -38,7 +38,6 @@ import org.apache.empire.jakarta.controls.InputControl.InputInfo; import org.apache.empire.jakarta.controls.InputControlManager; import org.apache.empire.jakarta.controls.SelectInputControl; import org.apache.empire.jakarta.utils.StyleClass; -import org.apache.empire.jakarta.utils.TagEncodingHelper; import org.apache.empire.jakarta.utils.TagStyleClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -422,6 +421,7 @@ public class SelectTag extends UIInput implements NamingContainer protected void copyAttributes(UISelectOne input) { // set id + /* removed 2025-06-19 to avoid doubling of given id if (TagEncodingHelper.hasComponentId(this)) { // remove trailing underscore (workaround since parent and child may not have the same name) String inputId = this.getId(); @@ -432,9 +432,12 @@ public class SelectTag extends UIInput implements NamingContainer input.setId(inputId); } else - { // always set to CompoentID + { // set to CompoentID input.setId(SELECT_COMPONENT_ID); } + */ + // always set to CompoentID + input.setId(SELECT_COMPONENT_ID); // the map Map<String, Object> tagMap = getAttributes(); Map<String, Object> inputMap = input.getAttributes(); diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java index 9313b958..9f673947 100644 --- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java +++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/SelectTag.java @@ -47,7 +47,6 @@ import org.apache.empire.jsf2.controls.InputControl.InputInfo; import org.apache.empire.jsf2.controls.InputControlManager; import org.apache.empire.jsf2.controls.SelectInputControl; import org.apache.empire.jsf2.utils.StyleClass; -import org.apache.empire.jsf2.utils.TagEncodingHelper; import org.apache.empire.jsf2.utils.TagStyleClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -422,6 +421,7 @@ public class SelectTag extends UIInput implements NamingContainer protected void copyAttributes(UISelectOne input) { // set id + /* removed 2025-06-19 to avoid doubling of given id if (TagEncodingHelper.hasComponentId(this)) { // remove trailing underscore (workaround since parent and child may not have the same name) String inputId = this.getId(); @@ -432,9 +432,12 @@ public class SelectTag extends UIInput implements NamingContainer input.setId(inputId); } else - { // always set to CompoentID + { // set to CompoentID input.setId(SELECT_COMPONENT_ID); } + */ + // always set to CompoentID + input.setId(SELECT_COMPONENT_ID); // the map Map<String, Object> tagMap = getAttributes(); Map<String, Object> inputMap = input.getAttributes();