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 314c214f EMPIREDB-457 LabelTag: ignore styleClass attribute from
column and use "labelClass" instead.
314c214f is described below
commit 314c214ff3f2dd652cfed8fa9823983fa9fa65c8
Author: Rainer Döbele <[email protected]>
AuthorDate: Fri Mar 14 20:22:06 2025 +0100
EMPIREDB-457
LabelTag: ignore styleClass attribute from column and use "labelClass"
instead.
---
.../apache/empire/jakarta/components/LabelTag.java | 17 ++++++++++-------
.../empire/jakarta/utils/TagEncodingHelper.java | 20 +++++++++++++++-----
.../org/apache/empire/jsf2/components/LabelTag.java | 5 ++++-
.../apache/empire/jsf2/utils/TagEncodingHelper.java | 20 +++++++++++++++-----
4 files changed, 44 insertions(+), 18 deletions(-)
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/LabelTag.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/LabelTag.java
index 0fea3402..210bf2ec 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/LabelTag.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/components/LabelTag.java
@@ -20,19 +20,20 @@ package org.apache.empire.jakarta.components;
import java.io.IOException;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.html.HtmlOutputLabel;
-import jakarta.faces.component.visit.VisitCallback;
-import jakarta.faces.component.visit.VisitContext;
-import jakarta.faces.context.FacesContext;
-
import org.apache.empire.commons.ObjectUtils;
+import org.apache.empire.jakarta.controls.InputControl;
import org.apache.empire.jakarta.utils.TagEncodingHelper;
import org.apache.empire.jakarta.utils.TagEncodingHelperFactory;
import org.apache.empire.jakarta.utils.TagStyleClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.faces.component.UIOutput;
+import jakarta.faces.component.html.HtmlOutputLabel;
+import jakarta.faces.component.visit.VisitCallback;
+import jakarta.faces.component.visit.VisitContext;
+import jakarta.faces.context.FacesContext;
+
public class LabelTag extends UIOutput // implements NamingContainer
{
// Logger
@@ -99,7 +100,9 @@ public class LabelTag extends UIOutput // implements
NamingContainer
{ try {
creatingComponents = true;
String forInput = helper.getTagAttributeString("for");
- String styleClass = helper.getTagStyleClass(null, null);
+ String addlStyle =
helper.getColumnAttributeString("labelClass");
+ String userStyle =
helper.getTagAttributeString(InputControl.CSS_STYLE_CLASS);
+ String styleClass = helper.getTagStyleClass(null, addlStyle,
userStyle);
String style = helper.getTagAttributeString("style");
// createLabelComponent
labelComponent = helper.createLabelComponent(context,
forInput, styleClass, style, getColon());
diff --git
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
index d8c98f8e..52291829 100644
---
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
+++
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
@@ -298,7 +298,7 @@ public class TagEncodingHelper implements NamingContainer
// Use Column default
if (format==null && hasColumn())
{ // from column
- format =
StringUtils.toString(column.getAttribute("format"));
+ format = getColumnAttributeString("format");
}
if (format==null)
format = StringUtils.EMPTY;
@@ -1557,11 +1557,11 @@ public class TagEncodingHelper implements
NamingContainer
{
String title = getTagAttributeString("title");
if (title == null)
- title =
StringUtils.toString(column.getAttribute(Column.COLATTR_TOOLTIP));
+ title = getColumnAttributeString(Column.COLATTR_TOOLTIP);
if (title != null)
return getDisplayText(title);
// Check for short form
- if (hasFormat("short") &&
!ObjectUtils.isEmpty(column.getAttribute(COLATTR_ABBR_TITLE)))
+ if (hasFormat("short") &&
!ObjectUtils.isEmpty(getColumnAttribute(COLATTR_ABBR_TITLE)))
return getDisplayText(column.getTitle());
// No Title
@@ -1696,7 +1696,7 @@ public class TagEncodingHelper implements NamingContainer
{ // Check for short form
if (hasFormat("short"))
{
- label =
StringUtils.toString(column.getAttribute(COLATTR_ABBR_TITLE));
+ label = getColumnAttributeString(COLATTR_ABBR_TITLE);
if (label==null)
log.warn("No Abbreviation available for column {}. Using
normal title.", column.getName());
}
@@ -2072,6 +2072,16 @@ public class TagEncodingHelper implements NamingContainer
}
/* ********************** Attribute value ********************** */
+
+ public Object getColumnAttribute(String name)
+ {
+ return (column!=null ? column.getAttribute(name) : null);
+ }
+
+ public String getColumnAttributeString(String name)
+ {
+ return StringUtils.nullIfEmpty(getColumnAttribute(name));
+ }
public Object getTagAttributeValue(String name)
{
@@ -2128,7 +2138,7 @@ public class TagEncodingHelper implements NamingContainer
// Get column attribute
if ((value==null || append) && hasColumn())
{ // Check Column
- Object colValue = column.getAttribute(name);
+ Object colValue = getColumnAttribute(name);
if (append)
{ // append styles
if (ObjectUtils.isNotEmpty(colValue) &&
!colValue.equals(value))
diff --git
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java
index 903e3a89..8c992696 100644
---
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java
+++
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/components/LabelTag.java
@@ -27,6 +27,7 @@ import javax.faces.component.visit.VisitContext;
import javax.faces.context.FacesContext;
import org.apache.empire.commons.ObjectUtils;
+import org.apache.empire.jsf2.controls.InputControl;
import org.apache.empire.jsf2.utils.TagEncodingHelper;
import org.apache.empire.jsf2.utils.TagEncodingHelperFactory;
import org.apache.empire.jsf2.utils.TagStyleClass;
@@ -99,7 +100,9 @@ public class LabelTag extends UIOutput // implements
NamingContainer
{ try {
creatingComponents = true;
String forInput = helper.getTagAttributeString("for");
- String styleClass = helper.getTagStyleClass(null, null);
+ String addlStyle =
helper.getColumnAttributeString("labelClass");
+ String userStyle =
helper.getTagAttributeString(InputControl.CSS_STYLE_CLASS);
+ String styleClass = helper.getTagStyleClass(null, addlStyle,
userStyle);
String style = helper.getTagAttributeString("style");
// createLabelComponent
labelComponent = helper.createLabelComponent(context,
forInput, styleClass, style, getColon());
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 4a44be69..4b008e2e 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
@@ -298,7 +298,7 @@ public class TagEncodingHelper implements NamingContainer
// Use Column default
if (format==null && hasColumn())
{ // from column
- format =
StringUtils.toString(column.getAttribute("format"));
+ format = getColumnAttributeString("format");
}
if (format==null)
format = StringUtils.EMPTY;
@@ -1557,11 +1557,11 @@ public class TagEncodingHelper implements
NamingContainer
{
String title = getTagAttributeString("title");
if (title == null)
- title =
StringUtils.toString(column.getAttribute(Column.COLATTR_TOOLTIP));
+ title = getColumnAttributeString(Column.COLATTR_TOOLTIP);
if (title != null)
return getDisplayText(title);
// Check for short form
- if (hasFormat("short") &&
!ObjectUtils.isEmpty(column.getAttribute(COLATTR_ABBR_TITLE)))
+ if (hasFormat("short") &&
!ObjectUtils.isEmpty(getColumnAttribute(COLATTR_ABBR_TITLE)))
return getDisplayText(column.getTitle());
// No Title
@@ -1696,7 +1696,7 @@ public class TagEncodingHelper implements NamingContainer
{ // Check for short form
if (hasFormat("short"))
{
- label =
StringUtils.toString(column.getAttribute(COLATTR_ABBR_TITLE));
+ label = getColumnAttributeString(COLATTR_ABBR_TITLE);
if (label==null)
log.warn("No Abbreviation available for column {}. Using
normal title.", column.getName());
}
@@ -2072,6 +2072,16 @@ public class TagEncodingHelper implements NamingContainer
}
/* ********************** Attribute value ********************** */
+
+ public Object getColumnAttribute(String name)
+ {
+ return (column!=null ? column.getAttribute(name) : null);
+ }
+
+ public String getColumnAttributeString(String name)
+ {
+ return StringUtils.nullIfEmpty(getColumnAttribute(name));
+ }
public Object getTagAttributeValue(String name)
{
@@ -2128,7 +2138,7 @@ public class TagEncodingHelper implements NamingContainer
// Get column attribute
if ((value==null || append) && hasColumn())
{ // Check Column
- Object colValue = column.getAttribute(name);
+ Object colValue = getColumnAttribute(name);
if (append)
{ // append styles
if (ObjectUtils.isNotEmpty(colValue) &&
!colValue.equals(value))
