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 10:38:13 UTC

[myfaces] branch main updated: refactored

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 2b551dc99 refactored
2b551dc99 is described below

commit 2b551dc9938ba954da38ca6cd036b4b5cd2d6adf
Author: tandraschko <ta...@apache.org>
AuthorDate: Sat Feb 4 11:38:08 2023 +0100

    refactored
---
 .../apache/myfaces/renderkit/RendererUtils.java    | 27 +---------------------
 .../renderkit/html/util/HtmlRendererUtils.java     |  4 ++--
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
index cd04e8e78..54b315b4c 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
@@ -538,32 +538,7 @@ public final class RendererUtils
         }
     }
 
-    public static List getSelectItemList(UISelectOne uiSelectOne)
-    {
-        return internalGetSelectItemList(uiSelectOne, FacesContext.getCurrentInstance());
-    }
-
-    /**
-     * @param uiSelectOne
-     * @param facesContext
-     * @return List of SelectItem Objects
-     */
-    public static List<SelectItem> getSelectItemList(UISelectOne uiSelectOne, FacesContext facesContext)
-    {
-        return internalGetSelectItemList(uiSelectOne, facesContext);
-    }
-
-    /**
-     * @param uiSelectMany
-     * @param facesContext
-     * @return List of SelectItem Objects
-     */
-    public static List<SelectItem> getSelectItemList(UISelectMany uiSelectMany, FacesContext facesContext)
-    {
-        return internalGetSelectItemList(uiSelectMany, facesContext);
-    }
-
-    private static List<SelectItem> internalGetSelectItemList(UIComponent uiComponent, FacesContext facesContext)
+    public static List<SelectItem> getSelectItemList(UIComponent uiComponent, FacesContext facesContext)
     {
         List<SelectItem> list = new ArrayList<>();
 
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 80fbee800..e8a27cb0a 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
@@ -450,11 +450,11 @@ public final class HtmlRendererUtils
         if (selectMany)
         {
             writer.writeAttribute(HTML.MULTIPLE_ATTR, HTML.MULTIPLE_ATTR, null);
-            selectItemList = RendererUtils.getSelectItemList((UISelectMany) uiComponent, facesContext);
+            selectItemList = RendererUtils.getSelectItemList(uiComponent, facesContext);
         }
         else
         {
-            selectItemList = RendererUtils.getSelectItemList((UISelectOne) uiComponent, facesContext);
+            selectItemList = RendererUtils.getSelectItemList(uiComponent, facesContext);
         }
 
         if (size == Integer.MIN_VALUE)