[empire-db] branch master updated: EMPIREDB-354 TextInputControl: set cssStyle inside UIData

[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 df759c8  EMPIREDB-354 TextInputControl: set cssStyle inside UIData
df759c8 is described below

commit df759c8bb7b775e6ddf64bc0a3dd5f62610a9f4b
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Fri May 21 21:17:00 2021 +0200

    EMPIREDB-354
    TextInputControl: set cssStyle inside UIData
---
 .../empire/jsf2/controls/TextInputControl.java     | 30 +++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
index 2ef2baf..e51e894 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextInputControl.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Locale;
 
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
 import javax.faces.component.html.HtmlInputText;
 import javax.faces.component.html.HtmlOutputText;
 import javax.faces.component.html.HtmlPanelGroup;
@@ -98,7 +99,7 @@ public class TextInputControl extends InputControl
         compList.add(input);
         // add unit
         String unit = getUnitString(ii);
-        if (StringUtils.isNotEmpty(unit))
+        if (StringUtils.isNotEmpty(unit) && !hasFormatOption(ii, "nounit"))
         {   // add the unit
             compList.add(createUnitLabel("eUnit", ii, unit));
         }
@@ -121,10 +122,24 @@ public class TextInputControl extends InputControl
             throw new 
UnexpectedReturnValueException(comp.getClass().getName(), "compList.get(0)");
         }
         HtmlInputText input = (HtmlInputText) comp;
-               // required
-               addRemoveStyle(input, InputControl.STYLECLASS_REQUIRED, 
ii.isRequired());
+        if (ii.isInsideUIData())
+        {   // always reset the style class inside UIData
+            String tagStyle = 
StringUtils.toString(ii.getAttribute("styleClass"), null);
+            String cssStyle = getInputStyleClass(ii, tagStyle);
+            input.setStyleClass(cssStyle);
+            /*
+            String curStyle = input.getStyleClass();
+            if (curStyle==null || !curStyle.equals(cssStyle))
+            {   // log.info("{} ->  {} vs '{}'", ii.getColumn().getName(), 
inpStyle, reqStyle);
+                input.setStyleClass(cssStyle);
+            }
+            */
+        }
+        // required
+        addRemoveStyle(input, InputControl.STYLECLASS_REQUIRED, 
ii.isRequired());
         // modified
         addRemoveStyle(input, InputControl.STYLECLASS_MODIFIED, 
ii.isModified());
+
         // disabled
         DisabledType disabled = ii.getDisabled();
         if (disabled!=null)
@@ -157,6 +172,15 @@ public class TextInputControl extends InputControl
         return span;
     }
 
+    @Override
+    protected void setInputStyleClass(UIInput input, String cssStyleClass)
+    {
+        if (input instanceof HtmlInputText)
+            ((HtmlInputText)input).setStyleClass(cssStyleClass);
+        else
+            super.setInputStyleClass(input, cssStyleClass);
+    }
+
     // ------- parsing -------
 
     @Override