You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2023/02/04 13:18:49 UTC
[myfaces] branch main updated: unused code
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new d655cb052 unused code
d655cb052 is described below
commit d655cb0521c121edd40590f19043c1450d598171
Author: tandraschko <ta...@apache.org>
AuthorDate: Sat Feb 4 14:18:28 2023 +0100
unused code
---
.../renderkit/html/util/HtmlRendererUtils.java | 218 ---------------------
1 file changed, 218 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
index f6e056b6d..7086b7e9d 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
@@ -47,7 +47,6 @@ import jakarta.faces.component.UIViewRoot;
import jakarta.faces.component.ValueHolder;
import jakarta.faces.component.behavior.ClientBehavior;
import jakarta.faces.component.behavior.ClientBehaviorContext;
-import jakarta.faces.component.behavior.ClientBehaviorHolder;
import jakarta.faces.component.html.HtmlDataTable;
import jakarta.faces.component.html.HtmlMessages;
import jakarta.faces.component.html.HtmlPanelGrid;
@@ -64,7 +63,6 @@ import jakarta.faces.model.SelectItemGroup;
import org.apache.myfaces.renderkit.ClientBehaviorEvents;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.component.visit.MyFacesVisitHints;
-import org.apache.myfaces.core.api.shared.AttributeUtils;
import org.apache.myfaces.core.api.shared.ComponentUtils;
import org.apache.myfaces.core.api.shared.SharedRendererUtils;
@@ -401,108 +399,6 @@ public final class HtmlRendererUtils
}
}
- public static void renderListbox(FacesContext facesContext,
- UISelectOne selectOne, boolean disabled, int size,
- Converter converter) throws IOException
- {
- internalRenderSelect(facesContext, selectOne, disabled, size, false, converter);
- }
-
- public static void renderListbox(FacesContext facesContext,
- UISelectMany selectMany, boolean disabled, int size,
- Converter converter) throws IOException
- {
- internalRenderSelect(facesContext, selectMany, disabled, size, true, converter);
- }
-
- public static void renderMenu(FacesContext facesContext,
- UISelectOne selectOne, boolean disabled, Converter converter)
- throws IOException
- {
- internalRenderSelect(facesContext, selectOne, disabled, 1, false, converter);
- }
-
- public static void renderMenu(FacesContext facesContext,
- UISelectMany selectMany, boolean disabled, Converter converter)
- throws IOException
- {
- internalRenderSelect(facesContext, selectMany, disabled, 1, true, converter);
- }
-
- private static void internalRenderSelect(FacesContext facesContext,
- UIComponent uiComponent, boolean disabled, int size,
- boolean selectMany, Converter converter) throws IOException
- {
- ResponseWriter writer = facesContext.getResponseWriter();
- writer.startElement(HTML.SELECT_ELEM, uiComponent);
- if (uiComponent instanceof ClientBehaviorHolder
- && !((ClientBehaviorHolder) uiComponent).getClientBehaviors().isEmpty())
- {
- writer.writeAttribute(HTML.ID_ATTR, uiComponent.getClientId(facesContext), null);
- }
- else
- {
- HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
- }
- writer.writeAttribute(HTML.NAME_ATTR, uiComponent.getClientId(facesContext), null);
-
- List<SelectItem> selectItemList;
- if (selectMany)
- {
- writer.writeAttribute(HTML.MULTIPLE_ATTR, HTML.MULTIPLE_ATTR, null);
- selectItemList = RendererUtils.getSelectItemList(uiComponent, facesContext);
- }
- else
- {
- selectItemList = RendererUtils.getSelectItemList(uiComponent, facesContext);
- }
-
- if (size == Integer.MIN_VALUE)
- {
- //No size given (Listbox) --> size is number of select items
- writer.writeAttribute(HTML.SIZE_ATTR,
- Integer.toString(selectItemList.size()), null);
- }
- else
- {
- writer.writeAttribute(HTML.SIZE_ATTR, Integer.toString(size), null);
- }
-
- if (uiComponent instanceof ClientBehaviorHolder)
- {
- Map<String, List<ClientBehavior>> behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();
- renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent, behaviors);
- renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
- renderBehaviorizedFieldEventHandlersWithoutOnchange(facesContext, writer, uiComponent, behaviors);
- renderHTMLAttributes(
- writer,
- uiComponent,
- HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
- }
- else
- {
- renderHTMLAttributes(writer, uiComponent,
- HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
- }
-
- if (disabled)
- {
- writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
- }
-
- if (isReadOnly(uiComponent))
- {
- writer.writeAttribute(HTML.READONLY_ATTR, HTML.READONLY_ATTR, null);
- }
-
- Set lookupSet = getSubmittedOrSelectedValuesAsSet(selectMany, uiComponent, facesContext, converter);
-
- renderSelectOptions(facesContext, uiComponent, converter, lookupSet, selectItemList);
- // bug #970747: force separate end tag
- writer.writeText(RendererUtils.EMPTY_STRING, null);
- writer.endElement(HTML.SELECT_ELEM);
- }
-
public static Set getSubmittedOrSelectedValuesAsSet(boolean selectMany,
UIComponent uiComponent, FacesContext facesContext, Converter converter)
{
@@ -583,120 +479,6 @@ public final class HtmlRendererUtils
return converter;
}
- /**
- * Renders the select options for a <code>UIComponent</code> that is
- * rendered as an HTML select element.
- *
- * @param context the current <code>FacesContext</code>.
- * @param component the <code>UIComponent</code> whose options need to be
- * rendered.
- * @param converter <code>component</code>'s converter
- * @param lookupSet the <code>Set</code> to use to look up selected options
- * @param selectItemList the <code>List</code> of <code>SelectItem</code> s to be
- * rendered as HTML option elements.
- * @throws IOException
- */
- public static void renderSelectOptions(FacesContext context,
- UIComponent component, Converter converter, Set lookupSet,
- List selectItemList) throws IOException
- {
- ResponseWriter writer = context.getResponseWriter();
- // check for the hideNoSelectionOption attribute
- boolean hideNoSelectionOption = isHideNoSelectionOption(component);
- boolean componentDisabled = isTrue(component.getAttributes().get("disabled"));
-
- for (int i = 0; i < selectItemList.size(); i++)
- {
- SelectItem selectItem = (SelectItem) selectItemList.get(i);
- if (selectItem instanceof SelectItemGroup)
- {
- writer.startElement(HTML.OPTGROUP_ELEM, null); // component);
- writer.writeAttribute(HTML.LABEL_ATTR, selectItem.getLabel(), null);
- SelectItem[] selectItems = ((SelectItemGroup) selectItem).getSelectItems();
- renderSelectOptions(context, component, converter, lookupSet, Arrays.asList(selectItems));
- writer.endElement(HTML.OPTGROUP_ELEM);
- }
- else
- {
- String itemStrValue =
- SharedRendererUtils.getConvertedStringValue(context, component, converter,selectItem);
- boolean selected = lookupSet.contains(itemStrValue);
- //TODO/FIX: we always compare the String values, better fill lookupSet with Strings
- //only when useSubmittedValue==true, else use the real item value Objects
-
- // IF the hideNoSelectionOption attribute of the component is true
- // AND this selectItem is the "no selection option"
- // AND there are currently selected items
- // AND this item (the "no selection option") is not selected
- // (if there is currently no value on UISelectOne, lookupSet contains "")
- if (hideNoSelectionOption && selectItem.isNoSelectionOption()
- && !lookupSet.isEmpty()
- && !(lookupSet.size() == 1 && lookupSet.contains(""))
- && !selected)
- {
- // do not render this selectItem
- continue;
- }
-
- writer.write(TABULATOR);
- writer.startElement(HTML.OPTION_ELEM, null); // component);
- if (itemStrValue != null)
- {
- writer.writeAttribute(HTML.VALUE_ATTR, itemStrValue, null);
- }
- else
- {
- writer.writeAttribute(HTML.VALUE_ATTR, "", null);
- }
-
- if (selected)
- {
- writer.writeAttribute(HTML.SELECTED_ATTR, HTML.SELECTED_ATTR, null);
- }
-
- boolean disabled = selectItem.isDisabled();
- if (disabled)
- {
- writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
- }
-
- String labelClass = null;
-
- if (componentDisabled || disabled)
- {
- labelClass = (String) component.getAttributes().get(ComponentAttrs.DISABLED_CLASS_ATTR);
- }
- else
- {
- labelClass = (String) component.getAttributes().get(ComponentAttrs.ENABLED_CLASS_ATTR);
- }
- if (labelClass != null)
- {
- writer.writeAttribute("class", labelClass, "labelClass");
- }
-
- boolean escape = AttributeUtils.getBooleanAttribute(component, ComponentAttrs.ESCAPE_ATTR, false);
- //default is to escape
- //In Faces 1.2, when a SelectItem is created by default
- //selectItem.isEscape() returns true (this property
- //is not available on Faces 1.1).
- //so, if we found a escape property on the component
- //set to true, escape every item, but if not
- //check if isEscape() = true first.
- if (escape || selectItem.isEscape())
- {
- writer.writeText(selectItem.getLabel(), null);
- }
- else
- {
- writer.write(selectItem.getLabel());
- }
-
- writer.endElement(HTML.OPTION_ELEM);
- }
- }
- }
-
/**
* @return true, if the attribute was written
* @throws java.io.IOException