myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: unused code
Date Wed, 24 Jul 2019 19:56:53 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new b8fd8d5  unused code
b8fd8d5 is described below

commit b8fd8d529d05bb57e045401ff8c1544d1feeccde
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Wed Jul 24 21:56:37 2019 +0200

    unused code
---
 .../java/javax/faces/component/UIComponentBase.java  |  6 ------
 .../java/javax/faces/component/_ComponentUtils.java  | 20 ++------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/api/src/main/java/javax/faces/component/UIComponentBase.java b/api/src/main/java/javax/faces/component/UIComponentBase.java
index 930865d..2545aae 100755
--- a/api/src/main/java/javax/faces/component/UIComponentBase.java
+++ b/api/src/main/java/javax/faces/component/UIComponentBase.java
@@ -2370,11 +2370,6 @@ public abstract class UIComponentBase extends UIComponent
     {
        _cachedIsRendered = rendered;
     }
-    
-    <T> T getExpressionValue(String attribute, T explizitValue, T defaultValueIfExpressionNull)
-    {
-        return _ComponentUtils.getExpressionValue(this, attribute, explizitValue, defaultValueIfExpressionNull);
-    }
 
     void setOamVfMarkCreated(String markCreated)
     {
@@ -2481,7 +2476,6 @@ public abstract class UIComponentBase extends UIComponent
         }
         else
         {
-
             // clear out the stringBuilder by setting the length to 0
             sb.setLength(0);
         }
diff --git a/api/src/main/java/javax/faces/component/_ComponentUtils.java b/api/src/main/java/javax/faces/component/_ComponentUtils.java
index 66965aa..2955f2c 100755
--- a/api/src/main/java/javax/faces/component/_ComponentUtils.java
+++ b/api/src/main/java/javax/faces/component/_ComponentUtils.java
@@ -18,7 +18,6 @@
  */
 package javax.faces.component;
 
-import javax.el.ValueExpression;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.Validator;
@@ -281,8 +280,8 @@ class _ComponentUtils
                 String validatorMessage = input.getValidatorMessage();
                 if (validatorMessage != null)
                 {
-                    context.addMessage(input.getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,
-                        validatorMessage, validatorMessage));
+                    context.addMessage(input.getClientId(context),
+                            new FacesMessage(FacesMessage.SEVERITY_ERROR, validatorMessage,
validatorMessage));
                 }
                 else
                 {
@@ -304,21 +303,6 @@ class _ComponentUtils
         }
     }
 
-    @SuppressWarnings("unchecked")
-    static <T> T getExpressionValue(UIComponent component, String attribute, T overrideValue,
T defaultValue)
-    {
-        if (overrideValue != null)
-        {
-            return overrideValue;
-        }
-        ValueExpression ve = component.getValueExpression(attribute);
-        if (ve != null)
-        {
-            return (T)ve.getValue(component.getFacesContext().getELContext());
-        }
-        return defaultValue;
-    }
-
     static String getPathToComponent(UIComponent component)
     {
         StringBuilder buf = new StringBuilder();


Mime
View raw message