Author: awiner
Date: Fri Oct 20 09:29:49 2006
New Revision: 466186
URL: http://svn.apache.org/viewvc?view=rev&rev=466186
Log:
Merge back JSF 1.2 modifications, one step at a time. Having svn problems with
some files
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreResponseStateManager.java
Fri Oct 20 09:29:49 2006
@@ -67,7 +67,8 @@
ResponseWriter rw = context.getResponseWriter();
rw.startElement("input", null);
rw.writeAttribute("type", "hidden", null);
- rw.writeAttribute("name", _STATE_FIELD_NAME, null);
+ rw.writeAttribute("name", VIEW_STATE_PARAM, null);
+ rw.writeAttribute("id", VIEW_STATE_PARAM, null);
String s = encodeSerializedViewAsString(serializedView);
rw.writeAttribute("value", s, null);
@@ -75,6 +76,16 @@
rw.endElement("input");
}
+ @Override
+ /**
+ * A request is a postback if it contains the state parameter.
+ */
+ public boolean isPostback(FacesContext context)
+ {
+ Map requestParams = context.getExternalContext().getRequestParameterMap();
+ return requestParams.containsKey(VIEW_STATE_PARAM);
+ }
+
protected String encodeSerializedViewAsString(
StateManager.SerializedView serializedView) throws IOException
@@ -143,7 +154,7 @@
Map<String, String> requestParamMap =
context.getExternalContext().getRequestParameterMap();
- String stateString = requestParamMap.get(_STATE_FIELD_NAME);
+ String stateString = requestParamMap.get(VIEW_STATE_PARAM);
if (stateString == null)
return null;
@@ -193,8 +204,6 @@
return view;
}
-
- static private final String _STATE_FIELD_NAME =
"org.apache.myfaces.trinidad.faces.STATE";
/* Test code for dumping out the page's state
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
Fri Oct 20 09:29:49 2006
@@ -19,12 +19,13 @@
import java.util.Iterator;
+import javax.el.ValueExpression;
+
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
import javax.faces.validator.Validator;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -227,15 +228,15 @@
if (Boolean.TRUE.equals(o))
return true;
- // Now, if the ValueBinding underlying the value says it's
+ // Now, if the ValueExpression underlying the value says it's
// read-only, then again, it is.
- ValueBinding vb = getValueBinding(bean);
- if ((vb != null) && vb.isReadOnly(context))
+ ValueExpression ve = getValueExpression(bean);
+ if ((ve != null) && ve.isReadOnly(context.getELContext()))
{
if (_LOG.isFiner())
{
_LOG.finer("Value expression {0} is read-only",
- vb.getExpressionString());
+ ve.getExpressionString());
}
return true;
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputColorRenderer.java
Fri Oct 20 09:29:49 2006
@@ -70,7 +70,7 @@
{
FacesBean bean = getFacesBean(component);
// If there's a non-default action, then just launch away
- if (getAction(bean) != null)
+ if (getActionExpression(bean) != null)
{
super.queueActionEvent(context, component);
}
@@ -291,7 +291,7 @@
// If the field has an action, use the default behavior. Or,
// if the field doesn't support launching a window at all,
// use the default behavior.
- if ((getAction(bean) != null) ||
+ if ((getActionExpression(bean) != null) ||
!Boolean.TRUE.equals(
arc.getAgent().getCapabilities().get(TrinidadAgent.CAP_MULTIPLE_WINDOWS)))
return super.getLaunchOnclick(context, arc, component, bean);
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputDateRenderer.java
Fri Oct 20 09:29:49 2006
@@ -73,7 +73,7 @@
{
FacesBean bean = getFacesBean(component);
// If there's a non-default action, then just launch away
- if (getAction(bean) != null)
+ if (getActionExpression(bean) != null)
{
super.queueActionEvent(context, component);
}
@@ -335,7 +335,7 @@
// If the field has an action, use the default behavior. Or,
// if the field doesn't support launching a window at all,
// use the default behavior.
- if ((getAction(bean) != null) ||
+ if ((getActionExpression(bean) != null) ||
!Boolean.TRUE.equals(
arc.getAgent().getCapabilities().get(TrinidadAgent.CAP_MULTIPLE_WINDOWS)))
return super.getLaunchOnclick(context, arc, component, bean);
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleInputListOfValuesRenderer.java
Fri Oct 20 09:29:49 2006
@@ -60,7 +60,7 @@
super.findTypeConstants(type);
_searchDescKey = type.findKey("searchDesc");
_iconKey = type.findKey("icon");
- _actionKey = type.findKey("action");
+ _actionExpressionKey = type.findKey("actionExpression");
}
//
@@ -357,9 +357,9 @@
return true;
}
- protected Object getAction(FacesBean bean)
+ protected Object getActionExpression(FacesBean bean)
{
- return bean.getProperty(_actionKey);
+ return bean.getProperty(_actionExpressionKey);
}
protected String getSearchDesc(
@@ -392,7 +392,7 @@
return "af|inputListOfValues::content";
}
- private PropertyKey _actionKey;
+ private PropertyKey _actionExpressionKey;
private PropertyKey _iconKey;
private PropertyKey _searchDescKey;
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
Fri Oct 20 09:29:49 2006
@@ -23,14 +23,14 @@
import java.util.Arrays;
import java.util.List;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
-
import javax.faces.model.SelectItem;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -92,10 +92,10 @@
converter = getDefaultConverter(context, bean);
Class<?> modelClass = null;
- ValueBinding binding = getValueBinding(bean);
- if (binding != null)
+ ValueExpression expression = getValueExpression(bean);
+ if (expression != null)
{
- modelClass = binding.getType(context);
+ modelClass = expression.getType(context.getELContext());
}
boolean valuePassThru = getValuePassThru(getFacesBean(component));
@@ -144,11 +144,11 @@
FacesContext context,
FacesBean bean)
{
- ValueBinding binding = getValueBinding(bean);
- if (binding == null)
+ ValueExpression expression = getValueExpression(bean);
+ if (expression == null)
return null;
- Class<?> type = binding.getType(context);
+ Class<?> type = expression.getType(context.getELContext());
if ((type == null) || type.isAssignableFrom(List.class))
return null;
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
Fri Oct 20 09:29:49 2006
@@ -15,10 +15,11 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
@@ -66,11 +67,11 @@
FacesContext context,
FacesBean bean)
{
- ValueBinding binding = getValueBinding(bean);
- if (binding == null)
+ ValueExpression expression = getValueExpression(bean);
+ if (expression == null)
return null;
- Class<?> type = binding.getType(context);
+ Class<?> type = expression.getType(context.getELContext());
return ConverterUtils.createConverter(context, type);
}
@@ -80,11 +81,11 @@
}
/**
- * Returns the ValueBinding for the "value" property.
+ * Returns the ValueExpression for the "value" property.
*/
- protected ValueBinding getValueBinding(FacesBean bean)
+ protected ValueExpression getValueExpression(FacesBean bean)
{
- return bean.getValueBinding(_valueKey);
+ return bean.getValueExpression(_valueKey);
}
protected Converter getConverter(FacesBean bean)
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TableSelectOneRenderer.java
Fri Oct 20 09:29:49 2006
@@ -237,6 +237,13 @@
}
@Override
+ protected String getClientId(FacesContext context, UIComponent component)
+ {
+ // We use the table's container client ID
+ return component.getContainerClientId(context);
+ }
+
+ @Override
protected Object getSubmittedValue(FacesBean bean)
{
TableRenderingContext tContext =
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
Fri Oct 20 09:29:49 2006
@@ -135,7 +135,7 @@
{
// we need to render a unique ID for the expand/collapse link, so that
// PPR can restore the focus correctly after a PPR request:
- String tableName = tContext.getTable().getClientId(fc);
+ String tableName = tContext.getTable().getContainerClientId(fc);
String id = tableName + NamingContainer.SEPARATOR_CHAR + _ICON_ID;
fc.getResponseWriter().writeAttribute("id", id, null);
}
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/ComponentFacesBean.java
Fri Oct 20 09:29:49 2006
@@ -18,6 +18,8 @@
import java.util.Iterator;
import java.util.Set;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
@@ -66,9 +68,20 @@
throw new UnsupportedOperationException();
}
+
final public ValueBinding getValueBinding(PropertyKey key)
{
return _component.getValueBinding(key.getName());
+ }
+
+ final public ValueExpression getValueExpression(PropertyKey key)
+ {
+ return _component.getValueExpression(key.getName());
+ }
+
+ final public void setValueExpression(PropertyKey key, ValueExpression
expression)
+ {
+ throw new UnsupportedOperationException();
}
final public Object getRawProperty(PropertyKey key)
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java?view=diff&rev=466186&r1=466185&r2=466186
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
Fri Oct 20 09:29:49 2006
@@ -22,13 +22,14 @@
import java.util.List;
import java.util.Map;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectItem;
import javax.faces.component.UISelectItems;
import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
import javax.faces.model.SelectItem;
import org.apache.myfaces.trinidad.component.UIXSelectItem;
import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
@@ -370,13 +371,13 @@
Converter converter = null;
Class<?> modelClass = null;
- ValueBinding binding = component.getValueBinding("value");
- if (binding != null)
+ ValueExpression expression = component.getValueExpression("value");
+ if (expression != null)
{
- modelClass = binding.getType(fContext);
+ modelClass = expression.getType(fContext.getELContext());
if (modelClass == null)
{
- Object o = binding.getValue(fContext);
+ Object o = expression.getValue(fContext.getELContext());
if (o != null)
{
modelClass = o.getClass();
