[empire-db] branch master updated: EMPIREDB-286

[derjan]

This is an automated email from the ASF dual-hosted git repository.

derjan 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 d1568c6  EMPIREDB-286
d1568c6 is described below

commit d1568c6629a235b29083997c44bcfd1cc04e9d8e
Author: Jan Glaubitz <j...@glaubitz.org>
AuthorDate: Tue May 14 11:11:25 2019 +0200

    EMPIREDB-286
    
    - ControlTag: obey "colon" attribute
---
 .../java/org/apache/empire/jsf2/components/ControlTag.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 0bce482..2b7b1da 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
@@ -471,7 +471,7 @@ public class ControlTag extends UIInput implements 
NamingContainer
             {
                 String forInput = isCustomInput() ? 
helper.getTagAttributeString("for") : "*";
                 // createLabelComponent 
-                labelComponent = helper.createLabelComponent(context, 
forInput, "eLabel", null, true);
+                labelComponent = helper.createLabelComponent(context, 
forInput, "eLabel", null, getColon());
                 parent.getChildren().add(0, labelComponent);
                 helper.resetComponentId(labelComponent);
             }
@@ -660,6 +660,14 @@ public class ControlTag extends UIInput implements 
NamingContainer
     {
         return helper.isValueRequired();
     }
+    
+    protected boolean getColon()
+    {
+        Object colon = getAttributes().get("colon");
+        if (colon!=null)
+            return ObjectUtils.getBoolean(colon);
+        return true;
+    }
 
     protected boolean isPartialSubmit(FacesContext context)
     {