You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2008/10/02 16:58:27 UTC
svn commit: r701142 - in
/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util:
ELUtils.java FaceletsTaglibExpressionUtils.java
Author: gpetracek
Date: Thu Oct 2 07:58:27 2008
New Revision: 701142
URL: http://svn.apache.org/viewvc?rev=701142&view=rev
Log:
minor changes
Modified:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java?rev=701142&r1=701141&r2=701142&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ELUtils.java Thu Oct 2 07:58:27 2008
@@ -26,6 +26,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
+import java.io.Externalizable;
/**
* in order to centralize the jsf version dependency within the core
@@ -118,4 +119,20 @@
return (valueBinding != null) ? valueBinding.getType(facesContext) : null;
}
+
+ public static boolean isELTerm(Object o)
+ {
+ if (o instanceof ValueBinding || o instanceof Externalizable)
+ {
+ return false;
+ }
+
+ String s = o.toString();
+ return ((s.contains("#") || s.contains("$")) && s.contains("{") && s.contains("}"));
+ }
+
+ public static Object getBindingOfComponent(UIComponent uiComponent, String name)
+ {
+ return uiComponent.getValueBinding(name);
+ }
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java?rev=701142&r1=701141&r2=701142&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FaceletsTaglibExpressionUtils.java Thu Oct 2 07:58:27 2008
@@ -24,8 +24,6 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import javax.faces.component.UIComponent;
-import javax.faces.el.ValueBinding;
-import java.io.Externalizable;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
@@ -48,7 +46,7 @@
try
{
- List<String> foundBindings = extractELTerms(uiComponent.getValueBinding("value"));
+ List<String> foundBindings = extractELTerms(ELUtils.getBindingOfComponent(uiComponent, "value"));
return faceletsValueBindingExpression.substring(0, 1) + "{" + createBinding(foundBindings) + "}";
}
@@ -165,7 +163,7 @@
return elCount;
}
- if (isELTerm(o))
+ if (ELUtils.isELTerm(o))
{
if (foundELTerms != null)
{
@@ -185,7 +183,7 @@
{
if (o.toString().startsWith("[Ljava.lang.String"))
{
- if (isELTerm(Array.get(o, i)))
+ if (ELUtils.isELTerm(Array.get(o, i)))
{
if (foundELTerms != null)
{
@@ -216,7 +214,7 @@
if (currentField.getType().equals(String.class))
{
- if (currentField.get(o) != null && isELTerm(currentField.get(o)))
+ if (currentField.get(o) != null && ELUtils.isELTerm(currentField.get(o)))
{
if (foundELTerms != null)
{
@@ -233,17 +231,6 @@
return elCount;
}
- private static boolean isELTerm(Object o)
- {
- if (o instanceof ValueBinding || o instanceof Externalizable)
- {
- return false;
- }
-
- String s = o.toString();
- return ((s.contains("#") || s.contains("$")) && s.contains("{") && s.contains("}"));
- }
-
private static List<Field> findAllAttributes(Class c, List<Field> attributes)
{
if (c == null)