(empire-db) branch master updated: EMPIREDB-431 TextInputControl: fix for readOnly reset

[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 da1e0055 EMPIREDB-431 TextInputControl: fix for readOnly reset
da1e0055 is described below

commit da1e0055c6404996d584a40008b92a73eb0f33b0
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Mon Nov 11 18:53:46 2024 +0100

    EMPIREDB-431
    TextInputControl: fix for readOnly reset
---
 .../org/apache/empire/jakarta/controls/TextAreaInputControl.java   | 7 +++----
 .../java/org/apache/empire/jakarta/controls/TextInputControl.java  | 7 +++----
 .../java/org/apache/empire/jsf2/controls/TextAreaInputControl.java | 7 +++----
 .../java/org/apache/empire/jsf2/controls/TextInputControl.java     | 7 +++----
 empire-db/src/main/java/org/apache/empire/commons/StringUtils.java | 6 +++---
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java
index 41e208f9..fae1f864 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextAreaInputControl.java
@@ -111,10 +111,9 @@ public class TextAreaInputControl extends InputControl
         HtmlInputTextarea input = (HtmlInputTextarea)comp;
         // disabled
         DisabledType disabled = ii.getDisabled();
-        if (disabled!=null)
-        {   input.setReadonly((disabled==DisabledType.READONLY));
-            input.setDisabled((disabled==DisabledType.DISABLED));
-        }
+        input.setReadonly((disabled==DisabledType.READONLY));
+        input.setDisabled((disabled==DisabledType.DISABLED));
+        
         // Set Value
         if (phaseId==PhaseId.RENDER_RESPONSE)
         {   // style
diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java
index 3e2e3fe3..d7896487 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/controls/TextInputControl.java
@@ -145,10 +145,9 @@ public class TextInputControl extends InputControl
 
         // disabled
         DisabledType disabled = ii.getDisabled();
-        if (disabled!=null)
-        {   input.setReadonly((disabled==DisabledType.READONLY));
-            input.setDisabled((disabled==DisabledType.DISABLED));
-        }
+        input.setReadonly((disabled==DisabledType.READONLY));
+        input.setDisabled((disabled==DisabledType.DISABLED));
+        
         // set value
         if (phaseId==PhaseId.RENDER_RESPONSE)
         {   // style
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java
index 6e4341c1..4c6b40af 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/TextAreaInputControl.java
@@ -111,10 +111,9 @@ public class TextAreaInputControl extends InputControl
         HtmlInputTextarea input = (HtmlInputTextarea)comp;
         // disabled
         DisabledType disabled = ii.getDisabled();
-        if (disabled!=null)
-        {   input.setReadonly((disabled==DisabledType.READONLY));
-            input.setDisabled((disabled==DisabledType.DISABLED));
-        }
+        input.setReadonly((disabled==DisabledType.READONLY));
+        input.setDisabled((disabled==DisabledType.DISABLED));
+        
         // Set Value
         if (phaseId==PhaseId.RENDER_RESPONSE)
         {   // style
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 300f1fe0..96f4e0cd 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
@@ -145,10 +145,9 @@ public class TextInputControl extends InputControl
 
         // disabled
         DisabledType disabled = ii.getDisabled();
-        if (disabled!=null)
-        {   input.setReadonly((disabled==DisabledType.READONLY));
-            input.setDisabled((disabled==DisabledType.DISABLED));
-        }
+        input.setReadonly((disabled==DisabledType.READONLY));
+        input.setDisabled((disabled==DisabledType.DISABLED));
+        
         // set value
         if (phaseId==PhaseId.RENDER_RESPONSE)
         {   // style
diff --git a/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java 
b/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
index 2e4a6cd7..c8ec6ae7 100644
--- a/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
+++ b/empire-db/src/main/java/org/apache/empire/commons/StringUtils.java
@@ -456,15 +456,15 @@ public class StringUtils
     }
 
     /**
-     * Assembles a string from parts with a separator
+     * Assembles a string from parts with a separator char
      * 
      * @param separator the separator to put between the object strings
      * @param params array of objects
      * @return returns a String
      */
-    public static String concat(String separator, Object... params)
+    public static String concatItems(char separator, Object... params)
     {
-        return arrayToString(params, separator);
+        return arrayToString(params, String.valueOf(separator));
     }
 
     /**