[empire-db] branch master updated: EMPIREDB-312 TagEncodingHelper new method isRenderValueComponent()

[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 25ebfd3  EMPIREDB-312 TagEncodingHelper new method 
isRenderValueComponent()
25ebfd3 is described below

commit 25ebfd37e929be2dd8223ded2cea0c42f98ee88e
Author: Rainer Döbele <doeb...@apache.org>
AuthorDate: Mon Oct 14 19:58:09 2019 +0200

    EMPIREDB-312
    TagEncodingHelper new method isRenderValueComponent()
---
 .../src/main/java/org/apache/empire/jsf2/components/ControlTag.java | 4 ++--
 .../src/main/java/org/apache/empire/jsf2/components/InputTag.java   | 6 +++---
 .../main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java   | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
index 4fbeb09..7591393 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/ControlTag.java
@@ -513,7 +513,7 @@ public class ControlTag extends UIInput implements 
NamingContainer
                 control.updateInputState(parent, inpInfo, context, true);
             }
             // set rendered
-            boolean readOnly = helper.isRecordReadOnly();
+            boolean renderValue = helper.isRenderValueComponent();
             List<UIComponent> children = parent.getChildren();
             for (UIComponent child : children)
             {   // reset child id
@@ -521,7 +521,7 @@ public class ControlTag extends UIInput implements 
NamingContainer
                     child.setId(child.getId());
                 // set rendered
                 boolean valueOutput = (child instanceof ValueOutputComponent);
-                child.setRendered((valueOutput ? readOnly : !readOnly));
+                child.setRendered((valueOutput ? renderValue : !renderValue));
             }
             // render
             control.renderInput(parent, inpInfo, context);
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
index 159c62c..71f6fe2 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/InputTag.java
@@ -190,11 +190,11 @@ public class InputTag extends UIInput implements 
NamingContainer
         }
         
         // set readonly
-        boolean readOnly = helper.isRecordReadOnly();
-        setRenderInput(!readOnly);
+        boolean renderValue = helper.isRenderValueComponent();
+        setRenderInput(!renderValue);
 
         // render components
-        if (readOnly)
+        if (renderValue)
         {   // render value
             String tagName = "span";
             String styleClass = helper.getTagStyleClass("eInpDis");
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 942aacf..e61712c 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
@@ -775,6 +775,11 @@ public class TagEncodingHelper implements NamingContainer
         }
     }
 
+    public boolean isRenderValueComponent()
+    {
+        return isRecordReadOnly();
+    }
+    
     public boolean isRecordReadOnly()
     {
         // check attribute