[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...
Gavin King
gavin.king at jboss.com
Sun May 13 04:33:36 EDT 2007
User: gavin
Date: 07/05/13 04:33:36
Modified: src/ui/org/jboss/seam/ui ConverterChain.java
EnumConverter.java EnumItem.java HtmlButton.java
HtmlLink.java HtmlOutputButton.java JSF.java
ModelValidator.java PrioritizableConverter.java
UICache.java UIFileUpload.java UISelectDate.java
UISelectItems.java UIStyleDecoration.java
UITaskId.java
Log:
get rid of use of deprecated methods
Revision Changes Path
1.10 +6 -8 jboss-seam/src/ui/org/jboss/seam/ui/ConverterChain.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConverterChain.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/ConverterChain.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ConverterChain.java 13 May 2007 07:25:44 -0000 1.9
+++ ConverterChain.java 13 May 2007 08:33:36 -0000 1.10
@@ -4,6 +4,7 @@
import java.util.Collections;
import java.util.List;
+import javax.el.ValueExpression;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
@@ -11,9 +12,6 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
-
-import bsh.commands.dir;
/**
* This class provides a chainable converter for JSF.
@@ -72,7 +70,7 @@
ValueHolder valueHolder = (ValueHolder) component;
if (!(valueHolder.getConverter() instanceof ConverterChain))
{
- ValueBinding converterValueBinding = component.getValueBinding("converter");
+ ValueExpression converterValueBinding = component.getValueExpression("converter");
if (converterValueBinding != null)
{
addConverterToChain(converterValueBinding);
@@ -83,11 +81,11 @@
}
else
{
- ValueBinding valueBinding = component.getValueBinding("value");
+ ValueExpression valueBinding = component.getValueExpression("value");
FacesContext facesContext = FacesContext.getCurrentInstance();
if (valueBinding != null)
{
- Class type = valueBinding.getType(facesContext);
+ Class type = valueBinding.getExpectedType();
Converter converter = facesContext.getApplication().createConverter(type);
if (converter!=null)
{
@@ -143,7 +141,7 @@
/**
* Add a converter to the end of the chain
*/
- public boolean addConverterToChain(ValueBinding c)
+ public boolean addConverterToChain(ValueExpression c)
{
return addConverterToChain(c, CHAIN_END);
}
@@ -167,7 +165,7 @@
/**
* Add a converter to the chain with a defined priority
*/
- public boolean addConverterToChain(ValueBinding c, int priority)
+ public boolean addConverterToChain(ValueExpression c, int priority)
{
if (c != null)
{
1.3 +5 -4 jboss-seam/src/ui/org/jboss/seam/ui/EnumConverter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EnumConverter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/EnumConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- EnumConverter.java 17 Mar 2007 15:33:23 -0000 1.2
+++ EnumConverter.java 13 May 2007 08:33:36 -0000 1.3
@@ -1,8 +1,9 @@
package org.jboss.seam.ui;
-import javax.faces.component.*;
-import javax.faces.context.*;
-import javax.faces.convert.*;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
public class EnumConverter
implements Converter
@@ -12,7 +13,7 @@
String value)
throws ConverterException
{
- Class enumType = comp.getValueBinding("value").getType(context);
+ Class enumType = comp.getValueExpression("value").getExpectedType();
return Enum.valueOf(enumType, value);
}
1.3 +4 -4 jboss-seam/src/ui/org/jboss/seam/ui/EnumItem.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EnumItem.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/EnumItem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- EnumItem.java 14 Dec 2006 09:10:55 -0000 1.2
+++ EnumItem.java 13 May 2007 08:33:36 -0000 1.3
@@ -1,8 +1,8 @@
package org.jboss.seam.ui;
+import javax.el.ValueExpression;
import javax.faces.component.UISelectItem;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.model.SelectItem;
public class EnumItem
@@ -31,9 +31,9 @@
private String labelValue() {
- ValueBinding valueBinding = getValueBinding("label");
+ ValueExpression valueBinding = getValueExpression("label");
if (valueBinding!=null) {
- Object labelValue = valueBinding.getValue(getFacesContext());
+ Object labelValue = valueBinding.getValue(getFacesContext().getELContext());
if (labelValue != null) {
return labelValue.toString();
}
@@ -44,7 +44,7 @@
@Override
public Object getValue()
{
- Class c = getParent().getValueBinding("value").getType(getFacesContext());
+ Class c = getParent().getValueExpression("value").getType(getFacesContext().getELContext());
SelectItem item = new SelectItem();
Object value = Enum.valueOf(c, enumValue);
1.13 +6 -6 jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HtmlButton.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- HtmlButton.java 9 Mar 2007 02:14:16 -0000 1.12
+++ HtmlButton.java 13 May 2007 08:33:36 -0000 1.13
@@ -7,6 +7,7 @@
import java.util.Map;
import java.util.Set;
+import javax.el.ValueExpression;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
@@ -14,7 +15,6 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
import javax.faces.event.ActionListener;
import javax.faces.model.DataModel;
@@ -40,7 +40,7 @@
{
if ( parentUIData.getValue() instanceof DataModel )
{
- String dataModelExpression = parentUIData.getValueBinding("value").getExpressionString();
+ String dataModelExpression = parentUIData.getValueExpression("value").getExpressionString();
String dataModelName = dataModelExpression.substring(2, dataModelExpression.length()-1).replace('$','.');
UISelection uiSelection = new UISelection();
uiSelection.setDataModel(dataModelName);
@@ -95,10 +95,10 @@
writer.writeAttribute("id", getClientId(context), "id");
String viewId;
- ValueBinding viewBinding = getValueBinding("view");
+ ValueExpression viewBinding = getValueExpression("view");
if (viewBinding!=null)
{
- viewId = (String) viewBinding.getValue(context);
+ viewId = (String) viewBinding.getValue(context.getELContext());
}
else if (view!=null)
{
@@ -190,11 +190,11 @@
first = false;
}
- ValueBinding taskInstanceValueBinding = getValueBinding("taskInstance");
+ ValueExpression taskInstanceValueBinding = getValueExpression("taskInstance");
if (taskInstanceValueBinding!=null)
{
UITaskId uiTaskId = new UITaskId();
- uiTaskId.setValueBinding("taskInstance", taskInstanceValueBinding);
+ uiTaskId.setValueExpression("taskInstance", taskInstanceValueBinding);
encodedUrl += getParameterString(characterEncoding, uiTaskId, first);
first = false;
}
1.33 +21 -7 jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HtmlLink.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- HtmlLink.java 9 Mar 2007 02:14:16 -0000 1.32
+++ HtmlLink.java 13 May 2007 08:33:36 -0000 1.33
@@ -5,6 +5,8 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
+import javax.el.ValueExpression;
import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
@@ -36,7 +38,7 @@
{
if ( parentUIData.getValue() instanceof DataModel )
{
- String dataModelExpression = parentUIData.getValueBinding("value").getExpressionString();
+ String dataModelExpression = parentUIData.getValueExpression("value").getExpressionString();
String dataModelName = dataModelExpression.substring(2, dataModelExpression.length()-1).replace('$','.');
UISelection uiSelection = new UISelection();
uiSelection.setDataModel(dataModelName);
@@ -79,10 +81,10 @@
writer.startElement("a", this);
writer.writeAttribute("id", getClientId(context), "id");
String viewId;
- ValueBinding viewBinding = getValueBinding("view");
+ ValueExpression viewBinding = getValueExpression("view");
if (viewBinding!=null)
{
- viewId = (String) viewBinding.getValue(context);
+ viewId = (String) viewBinding.getValue(context.getELContext());
}
else if (view!=null)
{
@@ -176,11 +178,11 @@
first = false;
}
- ValueBinding taskInstanceValueBinding = getValueBinding("taskInstance");
+ ValueExpression taskInstanceValueBinding = getValueExpression("taskInstance");
if (taskInstanceValueBinding!=null)
{
UITaskId uiTaskId = new UITaskId();
- uiTaskId.setValueBinding("taskInstance", taskInstanceValueBinding);
+ uiTaskId.setValueExpression("taskInstance", taskInstanceValueBinding);
encodedUrl += getParameterString(characterEncoding, uiTaskId, first);
first = false;
}
@@ -238,9 +240,9 @@
}
private boolean isDisabled(FacesContext facesContext)
{
- ValueBinding disabledValueBinding = getValueBinding("disabled");
+ ValueExpression disabledValueBinding = getValueExpression("disabled");
return disabledValueBinding==null ?
- disabled : (Boolean) disabledValueBinding.getValue(facesContext);
+ disabled : (Boolean) disabledValueBinding.getValue(facesContext.getELContext());
}
@Override
public void restoreState(FacesContext context, Object state) {
@@ -295,10 +297,14 @@
{
this.fragment = fragment;
}
+
+ @Override
public boolean isDisabled()
{
return disabled;
}
+
+ @Override
public void setDisabled(boolean disabled)
{
this.disabled = disabled;
@@ -307,25 +313,33 @@
//IMPLEMENT ActionSource:
public void addActionListener(ActionListener listener) { }
+
public MethodBinding getActionListener()
{
return null;
}
+
public ActionListener[] getActionListeners()
{
return null;
}
+
public boolean isImmediate()
{
return false;
}
+
public void setImmediate(boolean immediate) { }
+
public void removeActionListener(ActionListener listener) {}
+
public void setActionListener(MethodBinding actionListener) {}
+
public String getOutcome()
{
return outcome;
}
+
public void setOutcome(String outcome)
{
this.outcome = outcome;
1.2 +31 -31 jboss-seam/src/ui/org/jboss/seam/ui/HtmlOutputButton.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HtmlOutputButton.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlOutputButton.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- HtmlOutputButton.java 14 Nov 2006 04:59:39 -0000 1.1
+++ HtmlOutputButton.java 13 May 2007 08:33:36 -0000 1.2
@@ -15,15 +15,15 @@
*/
package org.jboss.seam.ui;
+import javax.el.ValueExpression;
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
/**
* see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
*
* @author Manfred Geiler (latest modification by $Author: gavin $)
- * @version $Revision: 1.1 $ $Date: 2006/11/14 04:59:39 $
+ * @version $Revision: 1.2 $ $Date: 2007/05/13 08:33:36 $
*/
public class HtmlOutputButton
extends UIOutput
@@ -77,7 +77,7 @@
public String getAccesskey()
{
if (_accesskey != null) return _accesskey;
- ValueBinding vb = getValueBinding("accesskey");
+ ValueExpression vb = getValueExpression("accesskey");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -89,7 +89,7 @@
public String getAlt()
{
if (_alt != null) return _alt;
- ValueBinding vb = getValueBinding("alt");
+ ValueExpression vb = getValueExpression("alt");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -101,7 +101,7 @@
public String getDir()
{
if (_dir != null) return _dir;
- ValueBinding vb = getValueBinding("dir");
+ ValueExpression vb = getValueExpression("dir");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -113,8 +113,8 @@
public boolean isDisabled()
{
if (_disabled != null) return _disabled.booleanValue();
- ValueBinding vb = getValueBinding("disabled");
- Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+ ValueExpression vb = getValueExpression("disabled");
+ Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext().getELContext()) : null;
return v != null ? v.booleanValue() : DEFAULT_DISABLED;
}
@@ -126,7 +126,7 @@
public String getImage()
{
if (_image != null) return _image;
- ValueBinding vb = getValueBinding("image");
+ ValueExpression vb = getValueExpression("image");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -138,7 +138,7 @@
public String getLang()
{
if (_lang != null) return _lang;
- ValueBinding vb = getValueBinding("lang");
+ ValueExpression vb = getValueExpression("lang");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -150,7 +150,7 @@
public String getOnblur()
{
if (_onblur != null) return _onblur;
- ValueBinding vb = getValueBinding("onblur");
+ ValueExpression vb = getValueExpression("onblur");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -162,7 +162,7 @@
public String getOnchange()
{
if (_onchange != null) return _onchange;
- ValueBinding vb = getValueBinding("onchange");
+ ValueExpression vb = getValueExpression("onchange");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -174,7 +174,7 @@
public String getOnclick()
{
if (_onclick != null) return _onclick;
- ValueBinding vb = getValueBinding("onclick");
+ ValueExpression vb = getValueExpression("onclick");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -186,7 +186,7 @@
public String getOndblclick()
{
if (_ondblclick != null) return _ondblclick;
- ValueBinding vb = getValueBinding("ondblclick");
+ ValueExpression vb = getValueExpression("ondblclick");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -198,7 +198,7 @@
public String getOnfocus()
{
if (_onfocus != null) return _onfocus;
- ValueBinding vb = getValueBinding("onfocus");
+ ValueExpression vb = getValueExpression("onfocus");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -210,7 +210,7 @@
public String getOnkeydown()
{
if (_onkeydown != null) return _onkeydown;
- ValueBinding vb = getValueBinding("onkeydown");
+ ValueExpression vb = getValueExpression("onkeydown");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -222,7 +222,7 @@
public String getOnkeypress()
{
if (_onkeypress != null) return _onkeypress;
- ValueBinding vb = getValueBinding("onkeypress");
+ ValueExpression vb = getValueExpression("onkeypress");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -234,7 +234,7 @@
public String getOnkeyup()
{
if (_onkeyup != null) return _onkeyup;
- ValueBinding vb = getValueBinding("onkeyup");
+ ValueExpression vb = getValueExpression("onkeyup");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -246,7 +246,7 @@
public String getOnmousedown()
{
if (_onmousedown != null) return _onmousedown;
- ValueBinding vb = getValueBinding("onmousedown");
+ ValueExpression vb = getValueExpression("onmousedown");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -258,7 +258,7 @@
public String getOnmousemove()
{
if (_onmousemove != null) return _onmousemove;
- ValueBinding vb = getValueBinding("onmousemove");
+ ValueExpression vb = getValueExpression("onmousemove");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -270,7 +270,7 @@
public String getOnmouseout()
{
if (_onmouseout != null) return _onmouseout;
- ValueBinding vb = getValueBinding("onmouseout");
+ ValueExpression vb = getValueExpression("onmouseout");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -282,7 +282,7 @@
public String getOnmouseover()
{
if (_onmouseover != null) return _onmouseover;
- ValueBinding vb = getValueBinding("onmouseover");
+ ValueExpression vb = getValueExpression("onmouseover");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -294,7 +294,7 @@
public String getOnmouseup()
{
if (_onmouseup != null) return _onmouseup;
- ValueBinding vb = getValueBinding("onmouseup");
+ ValueExpression vb = getValueExpression("onmouseup");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -306,7 +306,7 @@
public String getOnselect()
{
if (_onselect != null) return _onselect;
- ValueBinding vb = getValueBinding("onselect");
+ ValueExpression vb = getValueExpression("onselect");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -318,8 +318,8 @@
public boolean isReadonly()
{
if (_readonly != null) return _readonly.booleanValue();
- ValueBinding vb = getValueBinding("readonly");
- Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+ ValueExpression vb = getValueExpression("readonly");
+ Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext().getELContext()) : null;
return v != null ? v.booleanValue() : DEFAULT_READONLY;
}
@@ -331,7 +331,7 @@
public String getStyle()
{
if (_style != null) return _style;
- ValueBinding vb = getValueBinding("style");
+ ValueExpression vb = getValueExpression("style");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -343,7 +343,7 @@
public String getStyleClass()
{
if (_styleClass != null) return _styleClass;
- ValueBinding vb = getValueBinding("styleClass");
+ ValueExpression vb = getValueExpression("styleClass");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -355,7 +355,7 @@
public String getTabindex()
{
if (_tabindex != null) return _tabindex;
- ValueBinding vb = getValueBinding("tabindex");
+ ValueExpression vb = getValueExpression("tabindex");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -367,7 +367,7 @@
public String getTitle()
{
if (_title != null) return _title;
- ValueBinding vb = getValueBinding("title");
+ ValueExpression vb = getValueExpression("title");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : null;
}
@@ -379,7 +379,7 @@
public String getType()
{
if (_type != null) return _type;
- ValueBinding vb = getValueBinding("type");
+ ValueExpression vb = getValueExpression("type");
return vb != null ? JSF.getStringValue(getFacesContext(), vb) : DEFAULT_TYPE;
}
1.8 +9 -9 jboss-seam/src/ui/org/jboss/seam/ui/JSF.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JSF.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/JSF.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- JSF.java 3 Apr 2007 17:45:32 -0000 1.7
+++ JSF.java 13 May 2007 08:33:36 -0000 1.8
@@ -18,15 +18,15 @@
import java.io.IOException;
import java.util.List;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
/**
* Constant declarations for JSF tags
*
- * @author Anton Koinov (latest modification by $Author: pmuir $)
- * @version $Revision: 1.7 $ $Date: 2007/04/03 17:45:32 $
+ * @author Anton Koinov (latest modification by $Author: gavin $)
+ * @version $Revision: 1.8 $ $Date: 2007/05/13 08:33:36 $
*/
public class JSF
{
@@ -181,9 +181,9 @@
}
}
- public static String getStringValue(FacesContext context, ValueBinding vb)
+ public static String getStringValue(FacesContext context, ValueExpression vb)
{
- Object value = vb.getValue(context);
+ Object value = vb.getValue(context.getELContext());
if (value == null)
{
return null;
@@ -191,7 +191,7 @@
return value.toString();
}
- public static Integer getIntegerValue(FacesContext context, ValueBinding vb)
+ public static Integer getIntegerValue(FacesContext context, ValueExpression vb)
{
String value = getStringValue(context, vb);
if (value == null)
@@ -201,7 +201,7 @@
return new Integer(value);
}
- public static Double getDoubleValue(FacesContext context, ValueBinding vb)
+ public static Double getDoubleValue(FacesContext context, ValueExpression vb)
{
String value = getStringValue(context, vb);
if (value == null)
@@ -211,9 +211,9 @@
return new Double(value);
}
- public static Boolean getBooleanValue(FacesContext context, ValueBinding vb)
+ public static Boolean getBooleanValue(FacesContext context, ValueExpression vb)
{
- Object value = vb.getValue(context);
+ Object value = vb.getValue(context.getELContext());
if (value == null)
{
return null;
1.9 +2 -2 jboss-seam/src/ui/org/jboss/seam/ui/ModelValidator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ModelValidator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/ModelValidator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ModelValidator.java 16 Mar 2007 02:49:28 -0000 1.8
+++ ModelValidator.java 13 May 2007 08:33:36 -0000 1.9
@@ -1,9 +1,9 @@
package org.jboss.seam.ui;
+import javax.el.ValueExpression;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException;
@@ -17,7 +17,7 @@
public void validate(FacesContext context, UIComponent component, Object value)
throws ValidatorException
{
- ValueBinding valueBinding = component.getValueBinding("value");
+ ValueExpression valueBinding = component.getValueExpression("value");
if (valueBinding==null)
{
throw new RuntimeException("component has no value attribute: " + component.getId());
1.2 +8 -8 jboss-seam/src/ui/org/jboss/seam/ui/PrioritizableConverter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PrioritizableConverter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/PrioritizableConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PrioritizableConverter.java 7 Feb 2007 14:51:18 -0000 1.1
+++ PrioritizableConverter.java 13 May 2007 08:33:36 -0000 1.2
@@ -1,12 +1,12 @@
package org.jboss.seam.ui;
+import javax.el.ValueExpression;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
/**
* Helper class for ConverterChain
@@ -16,7 +16,7 @@
StateHolder
{
- private ValueBinding vb;
+ private ValueExpression valueExpression;
private Converter delegate;
@@ -26,9 +26,9 @@
{
}
- public PrioritizableConverter(ValueBinding vb, int priority)
+ public PrioritizableConverter(ValueExpression vb, int priority)
{
- this.vb = vb;
+ this.valueExpression = vb;
this.priority = priority;
}
@@ -40,9 +40,9 @@
public Converter getDelegate()
{
- if (vb != null)
+ if (valueExpression != null)
{
- return (Converter) vb.getValue(FacesContext.getCurrentInstance());
+ return (Converter) valueExpression.getValue( FacesContext.getCurrentInstance().getELContext() );
}
else
{
@@ -84,7 +84,7 @@
Object[] values = (Object[]) state;
delegate = (Converter) UIComponentBase.restoreAttachedState(context, values[0]);
priority = (Integer) values[1];
- vb = (ValueBinding) values[2];
+ valueExpression = (ValueExpression) values[2];
}
public Object saveState(FacesContext context)
@@ -92,7 +92,7 @@
Object[] values = new Object[3];
values[0] = UIComponentBase.saveAttachedState(context, delegate);
values[1] = priority;
- values[2] = vb;
+ values[2] = valueExpression;
return values;
}
1.8 +7 -7 jboss-seam/src/ui/org/jboss/seam/ui/UICache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UICache.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UICache.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- UICache.java 16 Jan 2007 20:52:45 -0000 1.7
+++ UICache.java 13 May 2007 08:33:36 -0000 1.8
@@ -3,15 +3,15 @@
import java.io.IOException;
import java.io.StringWriter;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.el.ValueBinding;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
import org.jboss.cache.CacheException;
import org.jboss.seam.core.PojoCache;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
public class UICache extends UIComponentBase
{
@@ -32,14 +32,14 @@
private String evaluateKey(FacesContext facesContext)
{
- ValueBinding keyValueBinding = getValueBinding("key");
- return keyValueBinding==null ? key : keyValueBinding.getValue(facesContext).toString();
+ ValueExpression keyValueExpression = getValueExpression("key");
+ return keyValueExpression==null ? key : keyValueExpression.getValue(facesContext.getELContext()).toString();
}
private boolean isEnabled(FacesContext facesContext)
{
- ValueBinding enabledValueBinding = getValueBinding("enabled");
- return enabledValueBinding==null || (Boolean) enabledValueBinding.getValue(facesContext);
+ ValueExpression enabledValueExpression = getValueExpression("enabled");
+ return enabledValueExpression==null || (Boolean) enabledValueExpression.getValue(facesContext.getELContext());
}
@Override
1.7 +13 -13 jboss-seam/src/ui/org/jboss/seam/ui/UIFileUpload.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIFileUpload.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UIFileUpload.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- UIFileUpload.java 24 Apr 2007 06:36:13 -0000 1.6
+++ UIFileUpload.java 13 May 2007 08:33:36 -0000 1.7
@@ -5,10 +5,10 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import javax.el.ValueExpression;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.el.ValueBinding;
import javax.servlet.ServletRequest;
import org.jboss.seam.web.MultipartRequest;
@@ -59,31 +59,31 @@
String fileName = request.getFileName(clientId);
int fileSize = request.getFileSize(clientId);
- ValueBinding dataBinding = getValueBinding("data");
+ ValueExpression dataBinding = getValueExpression("data");
if (dataBinding != null)
{
- Class cls = dataBinding.getType(context);
+ Class cls = dataBinding.getType(context.getELContext());
if (cls.isAssignableFrom(InputStream.class))
{
- dataBinding.setValue(context, request.getFileInputStream(clientId));
+ dataBinding.setValue(context.getELContext(), request.getFileInputStream(clientId));
}
else if (cls.isAssignableFrom(byte[].class))
{
- dataBinding.setValue(context, request.getFileBytes(clientId));
+ dataBinding.setValue(context.getELContext(), request.getFileBytes(clientId));
}
}
- ValueBinding vb = getValueBinding("contentType");
+ ValueExpression vb = getValueExpression("contentType");
if (vb != null)
- vb.setValue(context, contentType);
+ vb.setValue(context.getELContext(), contentType);
- vb = getValueBinding("fileName");
+ vb = getValueExpression("fileName");
if (vb != null)
- vb.setValue(context, fileName);
+ vb.setValue(context.getELContext(), fileName);
- vb = getValueBinding("fileSize");
+ vb = getValueExpression("fileSize");
if (vb != null)
- vb.setValue(context, fileSize);
+ vb.setValue(context.getELContext(), fileSize);
}
private ServletRequest unwrapMultipartRequest(ServletRequest request)
@@ -142,10 +142,10 @@
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
- ValueBinding vb = getValueBinding("accept");
+ ValueExpression vb = getValueExpression("accept");
if (vb != null)
{
- writer.writeAttribute(HTML.ACCEPT_ATTR, vb.getValue(context), null);
+ writer.writeAttribute(HTML.ACCEPT_ATTR, vb.getValue(context.getELContext()), null);
}
else if (accept != null)
{
1.5 +3 -3 jboss-seam/src/ui/org/jboss/seam/ui/UISelectDate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UISelectDate.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UISelectDate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- UISelectDate.java 16 Mar 2007 02:49:28 -0000 1.4
+++ UISelectDate.java 13 May 2007 08:33:36 -0000 1.5
@@ -6,11 +6,11 @@
import java.util.Locale;
import java.util.Map;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.el.ValueBinding;
import org.jboss.seam.ui.resource.WebResource;
@@ -30,7 +30,7 @@
public String getDateFormat()
{
- ValueBinding vb = getValueBinding("dateFormat");
+ ValueExpression vb = getValueExpression("dateFormat");
return (vb != null) ? JSF.getStringValue(getFacesContext(), vb) : dateFormat;
}
@@ -41,7 +41,7 @@
public String getFor()
{
- ValueBinding vb = getValueBinding("for");
+ ValueExpression vb = getValueExpression("for");
return (vb != null) ? JSF.getStringValue(getFacesContext(), vb) : forField;
}
1.15 +5 -6 jboss-seam/src/ui/org/jboss/seam/ui/UISelectItems.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UISelectItems.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UISelectItems.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- UISelectItems.java 13 Apr 2007 15:35:40 -0000 1.14
+++ UISelectItems.java 13 May 2007 08:33:36 -0000 1.15
@@ -5,13 +5,12 @@
import java.util.Arrays;
import java.util.List;
+import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
import javax.faces.model.DataModel;
-import javax.faces.model.SelectItem;
import org.jboss.seam.framework.EntityQuery;
@@ -61,7 +60,7 @@
}
else
{
- ValueBinding vb = getValueBinding("noSelectionLabel");
+ ValueExpression vb = getValueExpression("noSelectionLabel");
return vb == null ? null : JSF.getStringValue( getFacesContext(), vb);
}
}
@@ -79,7 +78,7 @@
}
else
{
- ValueBinding vb = getValueBinding("hideNoSelectionLabel");
+ ValueExpression vb = getValueExpression("hideNoSelectionLabel");
Boolean b = vb == null ? false : JSF.getBooleanValue(getFacesContext(), vb);
return b == null ? false : b;
}
@@ -108,7 +107,7 @@
}
else
{
- ValueBinding vb = getValueBinding("label");
+ ValueExpression vb = getValueExpression("label");
return vb == null ? null : JSF.getStringValue( getFacesContext(), vb);
}
}
@@ -126,7 +125,7 @@
}
else
{
- ValueBinding vb = getValueBinding("disabled");
+ ValueExpression vb = getValueExpression("disabled");
Boolean b = vb == null ? false : JSF.getBooleanValue(getFacesContext(), vb);
return b == null ? false : b;
}
1.7 +5 -5 jboss-seam/src/ui/org/jboss/seam/ui/UIStyleDecoration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIStyleDecoration.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UIStyleDecoration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- UIStyleDecoration.java 17 Mar 2007 17:32:34 -0000 1.6
+++ UIStyleDecoration.java 13 May 2007 08:33:36 -0000 1.7
@@ -2,10 +2,10 @@
import java.io.IOException;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.el.ValueBinding;
public abstract class UIStyleDecoration extends UIComponentBase
{
@@ -58,17 +58,17 @@
response.writeAttribute("id", getClientId(context), "id");
- ValueBinding classBinding = getValueBinding("styleClass");
+ ValueExpression classBinding = getValueExpression("styleClass");
String styleClass = classBinding==null ?
- this.styleClass : (String) classBinding.getValue(context);
+ this.styleClass : (String) classBinding.getValue(context.getELContext());
if (styleClass!=null)
{
response.writeAttribute("class", styleClass, "styleClass");
}
- ValueBinding styleBinding = getValueBinding("style");
+ ValueExpression styleBinding = getValueExpression("style");
String style = styleBinding==null ?
- this.style : (String) styleBinding.getValue(context);
+ this.style : (String) styleBinding.getValue(context.getELContext());
if (style!=null)
{
response.writeAttribute("style", style, "style");
1.2 +6 -4 jboss-seam/src/ui/org/jboss/seam/ui/UITaskId.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UITaskId.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UITaskId.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UITaskId.java 2 Apr 2006 23:49:42 -0000 1.1
+++ UITaskId.java 13 May 2007 08:33:36 -0000 1.2
@@ -1,7 +1,8 @@
package org.jboss.seam.ui;
+import javax.el.ELContext;
+import javax.el.ValueExpression;
import javax.faces.component.UIParameter;
-import javax.faces.el.ValueBinding;
import org.jbpm.taskmgmt.exe.TaskInstance;
@@ -19,9 +20,10 @@
@Override
public Object getValue()
{
- ValueBinding valueBinding = getValueBinding("taskInstance");
- if (valueBinding==null) valueBinding = getFacesContext().getApplication().createValueBinding("#{task}");
- TaskInstance taskInstance = (TaskInstance) valueBinding.getValue( getFacesContext() );
+ ValueExpression ValueExpression = getValueExpression("taskInstance");
+ ELContext context = getFacesContext().getELContext();
+ if (ValueExpression==null) ValueExpression = getFacesContext().getApplication().getExpressionFactory().createValueExpression(context, "#{task}", TaskInstance.class);
+ TaskInstance taskInstance = (TaskInstance) ValueExpression.getValue(context);
return taskInstance==null ? null : taskInstance.getId();
}
More information about the jboss-cvs-commits
mailing list