You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2025/05/07 10:21:03 UTC
(myfaces-tobago) branch tobago-5.x updated (2ef0da12dd -> db3d716ac9)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
from 2ef0da12dd build(deps-dev): bump org.seleniumhq.selenium:selenium-java
new 1ce69beee8 refactor(writeAdditionalAttributes): attribute name
new db3d716ac9 refactor(SelectOne/ManyList): method ordering
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../internal/renderkit/renderer/FileRenderer.java | 10 ++---
.../renderer/LabelLayoutRendererBase.java | 2 +-
.../renderkit/renderer/SelectManyListRenderer.java | 20 ++++-----
.../renderkit/renderer/SelectOneListRenderer.java | 49 +++++++++++-----------
4 files changed, 40 insertions(+), 41 deletions(-)
(myfaces-tobago) 02/02: refactor(SelectOne/ManyList): method ordering
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit db3d716ac911863f6d079805fdc62e38cd040eda
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed May 7 12:11:57 2025 +0200
refactor(SelectOne/ManyList): method ordering
---
.../renderkit/renderer/SelectManyListRenderer.java | 20 ++++-----
.../renderkit/renderer/SelectOneListRenderer.java | 49 +++++++++++-----------
2 files changed, 34 insertions(+), 35 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 227ff11af3..df74713409 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
@@ -62,8 +62,11 @@ protected CssItem[] getComponentCss(final FacesContext facesContext, final T com
}
@Override
- protected String getFieldId(FacesContext facesContext, T component) {
- return component.getFieldId(facesContext);
+ protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T component)
+ throws IOException {
+ super.writeAdditionalAttributes(facesContext, writer, component);
+ writer.writeAttribute(CustomAttributes.FILTER, component.getFilter(), true);
+ writer.writeAttribute(CustomAttributes.LOCAL_MENU, component.isLocalMenu());
}
@Override
@@ -95,14 +98,6 @@ protected void encodeBeginField(FacesContext facesContext, T component) throws I
writer.endElement(HtmlElements.DIV);
}
- @Override
- protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T component)
- throws IOException {
- super.writeAdditionalAttributes(facesContext, writer, component);
- writer.writeAttribute(CustomAttributes.FILTER, component.getFilter(), true);
- writer.writeAttribute(CustomAttributes.LOCAL_MENU, component.isLocalMenu());
- }
-
private void encodeHiddenSelect(
final FacesContext facesContext, final T component, final List<SelectItem> items,
final String clientId, final String fieldId, final boolean disabled) throws IOException {
@@ -276,4 +271,9 @@ protected void encodeEndField(FacesContext facesContext, T component) throws IOE
encodeBehavior(writer, facesContext, component);
}
+
+ @Override
+ protected String getFieldId(FacesContext facesContext, T component) {
+ return component.getFieldId(facesContext);
+ }
}
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 17ff3be693..3574947f8c 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
@@ -43,6 +43,30 @@
import java.util.List;
public class SelectOneListRenderer<T extends AbstractUISelectOneList> extends SelectOneRendererBase<T> {
+ @Override
+ public HtmlElements getComponentTag() {
+ return HtmlElements.TOBAGO_SELECT_ONE_LIST;
+ }
+
+ @Override
+ protected CssItem[] getComponentCss(final FacesContext facesContext, final T component) {
+ final List<SelectItem> items = SelectItemUtils.getItemList(facesContext, component);
+ final boolean disabled = !items.iterator().hasNext() || component.isDisabled() || component.isReadonly();
+
+ List<CssItem> cssItems = new ArrayList<>();
+ if (disabled) {
+ cssItems.add(TobagoClass.DISABLED);
+ }
+ return cssItems.toArray(new CssItem[0]);
+ }
+
+ @Override
+ protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T component)
+ throws IOException {
+ super.writeAdditionalAttributes(facesContext, writer, component);
+ writer.writeAttribute(CustomAttributes.FILTER, component.getFilter(), true);
+ writer.writeAttribute(CustomAttributes.LOCAL_MENU, component.isLocalMenu());
+ }
@Override
protected void encodeBeginField(FacesContext facesContext, T component) throws IOException {
@@ -245,31 +269,6 @@ protected void encodeEndField(FacesContext facesContext, T component) throws IOE
encodeBehavior(writer, facesContext, component);
}
- @Override
- public HtmlElements getComponentTag() {
- return HtmlElements.TOBAGO_SELECT_ONE_LIST;
- }
-
- @Override
- protected CssItem[] getComponentCss(final FacesContext facesContext, final T component) {
- final List<SelectItem> items = SelectItemUtils.getItemList(facesContext, component);
- final boolean disabled = !items.iterator().hasNext() || component.isDisabled() || component.isReadonly();
-
- List<CssItem> cssItems = new ArrayList<>();
- if (disabled) {
- cssItems.add(TobagoClass.DISABLED);
- }
- return cssItems.toArray(new CssItem[0]);
- }
-
- @Override
- protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T component)
- throws IOException {
- super.writeAdditionalAttributes(facesContext, writer, component);
- writer.writeAttribute(CustomAttributes.FILTER, component.getFilter(), true);
- writer.writeAttribute(CustomAttributes.LOCAL_MENU, component.isLocalMenu());
- }
-
@Override
protected String getFieldId(FacesContext facesContext, T component) {
return component.getFieldId(facesContext);
(myfaces-tobago) 01/02: refactor(writeAdditionalAttributes): attribute name
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 1ce69beee8740335125cd57af772a25283de19cc
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed May 7 12:06:49 2025 +0200
refactor(writeAdditionalAttributes): attribute name
---
.../tobago/internal/renderkit/renderer/FileRenderer.java | 10 +++++-----
.../internal/renderkit/renderer/LabelLayoutRendererBase.java | 2 +-
.../internal/renderkit/renderer/SelectManyListRenderer.java | 8 ++++----
.../internal/renderkit/renderer/SelectOneListRenderer.java | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
index 60430f0a18..55feb86e0e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
@@ -239,15 +239,15 @@ protected void encodeEndField(final FacesContext facesContext, final T component
@Override
protected void writeAdditionalAttributes(
- final FacesContext facesContext, final TobagoResponseWriter writer, final T input)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final T component)
throws IOException {
- super.writeAdditionalAttributes(facesContext, writer, input);
- final String dropZone = input.getDropZone();
+ super.writeAdditionalAttributes(facesContext, writer, component);
+ final String dropZone = component.getDropZone();
if (dropZone != null) {
- final String forId = ComponentUtils.evaluateClientId(facesContext, input, dropZone);
+ final String forId = ComponentUtils.evaluateClientId(facesContext, component, dropZone);
writer.writeAttribute(CustomAttributes.DROP_ZONE, forId, true);
}
- final long maxSize = createMaxSizeFromValidators(input);
+ final long maxSize = createMaxSizeFromValidators(component);
if (maxSize > 0) {
writer.writeAttribute(CustomAttributes.MAX_SIZE, maxSize);
final Locale locale = facesContext.getViewRoot().getLocale();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
index d673c303e5..c29555d6db 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
@@ -188,7 +188,7 @@ protected void encodeBeginSurroundingLabel(final FacesContext facesContext, fina
}
protected void writeAdditionalAttributes(
- final FacesContext facesContext, final TobagoResponseWriter writer, final T input)
+ final FacesContext facesContext, final TobagoResponseWriter writer, final T component)
throws IOException {
}
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 d20f1449ea..227ff11af3 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
@@ -96,11 +96,11 @@ protected void encodeBeginField(FacesContext facesContext, T component) throws I
}
@Override
- protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T input)
+ protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T component)
throws IOException {
- super.writeAdditionalAttributes(facesContext, writer, input);
- writer.writeAttribute(CustomAttributes.FILTER, input.getFilter(), true);
- writer.writeAttribute(CustomAttributes.LOCAL_MENU, input.isLocalMenu());
+ super.writeAdditionalAttributes(facesContext, writer, component);
+ writer.writeAttribute(CustomAttributes.FILTER, component.getFilter(), true);
+ writer.writeAttribute(CustomAttributes.LOCAL_MENU, component.isLocalMenu());
}
private void encodeHiddenSelect(
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 f2280f6ab5..17ff3be693 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
@@ -263,11 +263,11 @@ protected CssItem[] getComponentCss(final FacesContext facesContext, final T com
}
@Override
- protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T input)
+ protected void writeAdditionalAttributes(FacesContext facesContext, TobagoResponseWriter writer, T component)
throws IOException {
- super.writeAdditionalAttributes(facesContext, writer, input);
- writer.writeAttribute(CustomAttributes.FILTER, input.getFilter(), true);
- writer.writeAttribute(CustomAttributes.LOCAL_MENU, input.isLocalMenu());
+ super.writeAdditionalAttributes(facesContext, writer, component);
+ writer.writeAttribute(CustomAttributes.FILTER, component.getFilter(), true);
+ writer.writeAttribute(CustomAttributes.LOCAL_MENU, component.isLocalMenu());
}
@Override