(empire-db) branch master updated: EMPIREDB-431 TagEncodingHelper: use setColumn() to set column

[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 49f51109 EMPIREDB-431 TagEncodingHelper: use setColumn() to set column
49f51109 is described below

commit 49f511092d053ad1e36b236cd391d107eab1a915
Author: Rainer Döbele <rdoeb...@users.noreply.github.com>
AuthorDate: Sun Nov 17 11:33:42 2024 +0100

    EMPIREDB-431
    TagEncodingHelper: use setColumn() to set column
---
 .../apache/empire/jsf2/utils/TagEncodingHelper.java  | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

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 e9cabcfc..fdc228c1 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
@@ -668,18 +668,8 @@ public class TagEncodingHelper implements NamingContainer
     public boolean hasColumn()
     {
         if (column == null)
-            column = findColumn();
-        /* removed 2024-06-03
-        if (column == null)
-        {   // @deprecated: for compatibility only!
-            if (getTagAttributeValue("column")!=null)
-                return false; // provided but not found
-            // find value
-            column = findColumnFromValue();  
-            if (column!=null)
-                log.warn("Providing the column as the value is deprecated. Use 
column attribute instead. This might be removed in future versions!");
-        }
-        */
+            setColumn(findColumn());
+        // has column?
         return (column != null);
     }
 
@@ -695,14 +685,14 @@ public class TagEncodingHelper implements NamingContainer
     {
         // don't use hasColumn() or getColumn() here!
         if (column==null)
-            column = findColumn(); 
+            setColumn(findColumn()); 
         return (column!=null ? column.getName() : StringUtils.NULL);
     }
     
     public String getColumnFullName()
     {
         if (column==null)
-            column = findColumn();
+            setColumn(findColumn());
         if (column==null)
             return StringUtils.NULL;
         // Find Entity
@@ -1647,7 +1637,7 @@ public class TagEncodingHelper implements NamingContainer
                 if (input!=null && (input instanceof InputTag))
                 {   // Copy from InputTag
                     InputTag inputTag = ((InputTag)input);
-                    this.column = inputTag.getInputColumn();
+                    setColumn(inputTag.getInputColumn());
                     this.readOnly = (inputTag.isInputReadOnly() ? (byte)1 : 
(byte)0);
                     this.valueRequired = (inputTag.isInputRequired() ? (byte)1 
: (byte)0);
                 }