(empire-db) branch master updated: EMPIREDB-456: JSF: wrapper class default style

[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 b7667c6d EMPIREDB-456: JSF: wrapper class default style
b7667c6d is described below

commit b7667c6d83c1f54e31b43bc6f041b6e6f97d21a0
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Wed Apr 9 13:30:27 2025 +0200

    EMPIREDB-456:
    JSF: wrapper class default style
---
 .../src/main/java/org/apache/empire/jsf2/app/DBELResolver.java   | 2 +-
 .../java/org/apache/empire/jsf2/utils/ControlRenderInfo.java     | 9 +++++++--
 .../java/org/apache/empire/jsf2/utils/TagEncodingHelper.java     | 2 ++
 .../java/org/apache/empire/dbms/oracle/DBMSHandlerOracle.java    | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
index 1ec16b1c..c341810f 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/app/DBELResolver.java
@@ -70,7 +70,7 @@ public class DBELResolver extends ELResolver
         // Resolve database, table/view or column
         if (base instanceof DBRowSet)
         {   // Find matching column
-            String   name = StringUtils.toString(property);
+            String name = StringUtils.toString(property);
             DBColumnExpr column = ((DBRowSet)base).getColumn(name);
             if (column==null)
                 column = findExpressionField(base, name); 
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/ControlRenderInfo.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/ControlRenderInfo.java
index 641369d8..fde655f4 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/ControlRenderInfo.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/ControlRenderInfo.java
@@ -129,8 +129,13 @@ public class ControlRenderInfo
     {
         // wrapper Class
         String wrapperClass = helper.getTagAttributeStringEx("wrapperClass", 
true); 
-        if (wrapperClass!=null && wrapperClass.equals("-"))
-            wrapperClass= null;
+        if (wrapperClass!=null && wrapperClass.length()==1)
+        {   // special cases
+            if (wrapperClass.equals("-"))
+                wrapperClass=null; // ignore
+            else if (wrapperClass.equals("*"))
+                wrapperClass=TagStyleClass.INPUT_WRAPPER.get(); // use default 
style class
+        }
         // extra
         String extraStyleClass = helper.getControlExtraInputWrapperStyle();
         helper.writeStyleClass(writer, TagStyleClass.CONTROL_INPUT.get(), 
wrapperClass, extraStyleClass);
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 8d82126d..3ffb51ce 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
@@ -2196,6 +2196,8 @@ public class TagEncodingHelper implements NamingContainer
         String wrapperClass = getTagAttributeStringEx("wrapperClass", true); 
         if (wrapperClass==null || wrapperClass.equals("-"))
             return null;
+        if (wrapperClass.equals("*"))
+            wrapperClass=null; // only use default style class
         // start element
         String tagName = InputControl.HTML_TAG_DIV;
         ResponseWriter writer = context.getResponseWriter();
diff --git 
a/empire-db/src/main/java/org/apache/empire/dbms/oracle/DBMSHandlerOracle.java 
b/empire-db/src/main/java/org/apache/empire/dbms/oracle/DBMSHandlerOracle.java
index 143c73ba..b2296340 100644
--- 
a/empire-db/src/main/java/org/apache/empire/dbms/oracle/DBMSHandlerOracle.java
+++ 
b/empire-db/src/main/java/org/apache/empire/dbms/oracle/DBMSHandlerOracle.java
@@ -228,7 +228,7 @@ public class DBMSHandlerOracle extends DBMSHandlerBase
             case SQL_FUNC_MAX:                  return "max(?)";
             case SQL_FUNC_MIN:                  return "min(?)";
             case SQL_FUNC_AVG:                  return "avg(?)";
-            case SQL_FUNC_STRAGG:               return "listagg(?,{0}) WITHIN 
GROUP (ORDER BY {1})";
+            case SQL_FUNC_STRAGG:               return "listagg(?,{0:VARCHAR}) 
WITHIN GROUP (ORDER BY {1})";
             // Others
             case SQL_FUNC_DECODE:               return "decode(?{0})";
             case SQL_FUNC_DECODE_SEP:           return ", ";