You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2023/11/10 10:19:40 UTC
(myfaces-tobago) branch main updated: fix(SelectItem): Missing itemLabel in SelectItem throws NullPointerException issue: TOBAGO-2256
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/main by this push:
new f604f3656e fix(SelectItem): Missing itemLabel in SelectItem throws NullPointerException issue: TOBAGO-2256
f604f3656e is described below
commit f604f3656e96196c22c2f0a3f56f8c23a30b8846
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Thu Nov 9 20:25:25 2023 +0100
fix(SelectItem): Missing itemLabel in SelectItem throws NullPointerException
issue: TOBAGO-2256
---
.../internal/renderkit/renderer/SelectManyListRenderer.java | 10 ++++++++--
.../internal/renderkit/renderer/SelectOneListRenderer.java | 10 ++++++++--
.../java/org/apache/myfaces/tobago/renderkit/RendererBase.java | 5 ++++-
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java
index 3dd74ce2c8..d38383951c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListRenderer.java
@@ -188,7 +188,10 @@ public class SelectManyListRenderer<T extends AbstractUISelectManyList> extends
writer.writeClassAttribute(TobagoClass.SELECT__ITEM__GROUP, BootstrapClass.DISABLED);
writer.writeAttribute(HtmlAttributes.TABINDEX, -1);
writer.startElement(HtmlElements.TD);
- writer.writeText(item.getLabel());
+ final String label = item.getLabel();
+ if (label != null) {
+ writer.writeText(label);
+ }
writer.endElement(HtmlElements.TD);
writer.endElement(HtmlElements.TR);
final SelectItem[] selectItems = ((SelectItemGroup) item).getSelectItems();
@@ -241,7 +244,10 @@ public class SelectManyListRenderer<T extends AbstractUISelectManyList> extends
if (group) {
writer.startElement(HtmlElements.SPAN);
}
- writer.writeText(item.getLabel());
+ final String label = item.getLabel();
+ if (label != null) {
+ writer.writeText(label);
+ }
if (group) {
writer.endElement(HtmlElements.SPAN);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java
index 1867388fbb..35533d05fe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListRenderer.java
@@ -160,7 +160,10 @@ public class SelectOneListRenderer<T extends AbstractUISelectOneList> extends Se
writer.writeClassAttribute(TobagoClass.SELECT__ITEM__GROUP, BootstrapClass.DISABLED);
writer.writeAttribute(HtmlAttributes.TABINDEX, -1);
writer.startElement(HtmlElements.TD);
- writer.writeText(item.getLabel());
+ final String label = item.getLabel();
+ if (label != null) {
+ writer.writeText(label);
+ }
writer.endElement(HtmlElements.TD);
writer.endElement(HtmlElements.TR);
final SelectItem[] selectItems = ((SelectItemGroup) item).getSelectItems();
@@ -212,7 +215,10 @@ public class SelectOneListRenderer<T extends AbstractUISelectOneList> extends Se
if (group) {
writer.startElement(HtmlElements.SPAN);
}
- writer.writeText(item.getLabel());
+ final String label = item.getLabel();
+ if (label != null) {
+ writer.writeText(label);
+ }
if (group) {
writer.endElement(HtmlElements.SPAN);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
index 6a71712a3b..876cc1aac5 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
@@ -470,7 +470,10 @@ public abstract class RendererBase<T extends UIComponent> extends Renderer {
}
writer.writeClassAttribute(optionClass);
- writer.writeText(item.getLabel());
+ final String label = item.getLabel();
+ if (label != null) {
+ writer.writeText(label);
+ }
writer.endElement(HtmlElements.OPTION);
}
}