You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/03/30 20:14:26 UTC
svn commit: r1307565 [3/6] - in
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared:
application/ renderkit/ renderkit/html/ resource/ taglib/ taglib/core/
util/ util/io/ util/renderkit/
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java?rev=1307565&r1=1307564&r2=1307565&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java Fri Mar 30 18:14:25 2012
@@ -1,417 +1,417 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.shared.taglib;
-
-import java.util.logging.Logger;
-
-import javax.el.ELContext;
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
-import javax.faces.component.ActionSource2;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UICommand;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIGraphic;
-import javax.faces.component.UIParameter;
-import javax.faces.component.UISelectBoolean;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.event.MethodExpressionActionListener;
-import javax.faces.event.MethodExpressionValueChangeListener;
-import javax.faces.validator.MethodExpressionValidator;
-
-/**
- * @author Manfred Geiler (latest modification by $Author$)
- * @author Bruno Aranda (JSR-252)
- * @version $Revision$ $Date$
- *
- * @since 1.2
- */
-public class UIComponentELTagUtils
-{
- //private static final Log log = LogFactory.getLog(UIComponentELTagUtils.class);
- private static final Logger log = Logger
- .getLogger(UIComponentELTagUtils.class.getName());
-
- private UIComponentELTagUtils()
- {
- } //util class, no instantiation allowed
-
- /**
- * @since 1.2
- */
- public static void setIntegerProperty(UIComponent component,
- String propName, ValueExpression value)
- {
- setIntegerProperty(component, propName, value, null);
- }
-
- /**
- * @since 1.2
- */
- public static void setIntegerProperty(UIComponent component,
- String propName, ValueExpression value, Integer defaultValue)
- {
- if (value != null)
- {
- if (value.isLiteralText())
- {
- component.getAttributes().put(propName,
- Integer.valueOf(value.getExpressionString()));
- }
- else
- {
- component.setValueExpression(propName, value);
- }
- }
- else
- {
- if (defaultValue != null)
- {
- component.getAttributes().put(propName, defaultValue);
- }
- }
- }
-
- /**
- * @since 1.2
- */
- public static void setLongProperty(UIComponent component, String propName,
- ValueExpression value)
- {
- setLongProperty(component, propName, value, null);
- }
-
- /**
- * @since 1.2
- */
- public static void setLongProperty(UIComponent component, String propName,
- ValueExpression value, Long defaultValue)
- {
- if (value != null)
- {
- if (value.isLiteralText())
- {
- component.getAttributes().put(propName,
- Long.valueOf(value.getExpressionString()));
- }
- else
- {
- component.setValueExpression(propName, value);
- }
- }
- else
- {
- if (defaultValue != null)
- {
- component.getAttributes().put(propName, defaultValue);
- }
- }
- }
-
- /**
- * @since 1.2
- */
- public static void setStringProperty(UIComponent component,
- String propName, ValueExpression value)
- {
- setStringProperty(component, propName, value, null);
- }
-
- /**
- * @since 1.2
- */
- public static void setStringProperty(UIComponent component,
- String propName, ValueExpression value, String defaultValue)
- {
- if (value != null)
- {
- if (value.isLiteralText())
- {
- component.getAttributes().put(propName,
- value.getExpressionString());
- }
- else
- {
- component.setValueExpression(propName, value);
- }
- }
- else
- {
- if (defaultValue != null)
- {
- component.getAttributes().put(propName, defaultValue);
- }
- }
- }
-
- /**
- * @since 1.2
- */
- public static void setBooleanProperty(UIComponent component,
- String propName, ValueExpression value)
- {
- setBooleanProperty(component, propName, value, null);
- }
-
- /**
- * @since 1.2
- */
- public static void setBooleanProperty(UIComponent component,
- String propName, ValueExpression value, Boolean defaultValue)
- {
- if (value != null)
- {
- if (value.isLiteralText())
- {
- component.getAttributes().put(propName,
- Boolean.valueOf(value.getExpressionString()));
- }
- else
- {
- component.setValueExpression(propName, value);
- }
- }
- else
- {
- if (defaultValue != null)
- {
- component.getAttributes().put(propName, defaultValue);
- }
- }
- }
-
- /**
- * @since 1.2
- */
- public static void setValueProperty(FacesContext context,
- UIComponent component, ValueExpression value)
- {
- if (value != null)
- {
- if (!value.isLiteralText())
- {
- component.setValueExpression(
- org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR,
- value);
- }
- else if (component instanceof UICommand)
- {
- ((UICommand) component).setValue(value.getExpressionString());
- }
- else if (component instanceof UIParameter)
- {
- ((UIParameter) component).setValue(value.getExpressionString());
- }
- else if (component instanceof UISelectBoolean)
- {
- ((UISelectBoolean) component).setValue(Boolean.valueOf(value
- .getExpressionString()));
- }
- else if (component instanceof UIGraphic)
- {
- ((UIGraphic) component).setValue(value.getExpressionString());
- }
- //Since many input components are ValueHolders the special components
- //must come first, ValueHolder is the last resort.
- else if (component instanceof ValueHolder)
- {
- ((ValueHolder) component).setValue(value.getExpressionString());
- }
- else
- {
- log.severe("Component " + component.getClass().getName()
- + " is no ValueHolder, cannot set value.");
- }
- }
- }
-
- /**
- * @since 1.2
- */
- public static void setConverterProperty(FacesContext context,
- UIComponent component, ValueExpression value)
- {
- if (value != null)
- {
- if (component instanceof ValueHolder)
- {
- if (value.isLiteralText())
- {
- FacesContext facesContext = FacesContext
- .getCurrentInstance();
- Converter converter = facesContext.getApplication()
- .createConverter(value.getExpressionString());
- ((ValueHolder) component).setConverter(converter);
- }
- else
- {
- component
- .setValueExpression(
- org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR,
- value);
- }
- }
- else
- {
- log.severe("Component " + component.getClass().getName()
- + " is no ValueHolder, cannot set value.");
- }
- }
- }
-
- /**
- * @since 1.2
- */
- public static void addValidatorProperty(FacesContext context,
- UIComponent component, MethodExpression validator)
- {
- if (validator != null)
- {
- if (!(component instanceof EditableValueHolder))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no EditableValueHolder");
- }
-
- ((EditableValueHolder) component)
- .addValidator(new MethodExpressionValidator(validator));
- }
- }
-
- /**
- * @since 1.2
- */
- public static void setValueBinding(FacesContext context,
- UIComponent component, String propName, ValueExpression value)
- {
- if (value != null)
- {
- if (!value.isLiteralText())
- {
- component.setValueExpression(propName, value);
- }
- else
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context) + " attribute "
- + propName + " must be a value reference, was " + value);
- }
- }
- }
-
- /**
- * @since 1.2
- */
- public static void setActionProperty(FacesContext context,
- UIComponent component, MethodExpression action)
- {
- if (action != null)
- {
- if (!(component instanceof ActionSource2))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no ActionSource2");
- }
-
- ((ActionSource2) component).setActionExpression(action);
- }
- }
-
- /**
- * @since 1.2
- */
- public static void addActionListenerProperty(FacesContext context,
- UIComponent component, MethodExpression actionListener)
- {
- if (actionListener != null)
- {
- if (!(component instanceof ActionSource2))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no ActionSource");
- }
-
- ((ActionSource2) component)
- .addActionListener(new MethodExpressionActionListener(
- actionListener));
- }
- }
-
- /**
- * @since 1.2
- */
- public static void addValueChangedListenerProperty(FacesContext context,
- UIComponent component, MethodExpression valueChangedListener)
- {
- if (valueChangedListener != null)
- {
- if (!(component instanceof EditableValueHolder))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no EditableValueHolder");
- }
-
- ((EditableValueHolder) component)
- .addValueChangeListener(new MethodExpressionValueChangeListener(
- valueChangedListener));
- }
- }
-
- /**
- * @since 1.2
- */
- public static Object evaluateValueExpression(ELContext elContext,
- ValueExpression valueExpression)
- {
- return valueExpression.isLiteralText() ? valueExpression
- .getExpressionString() : valueExpression.getValue(elContext);
- }
-
- /**
- * @since 1.2
- */
- public static Boolean getBooleanValue(ELContext elContext,
- ValueExpression valueExpression)
- {
- if (valueExpression.isLiteralText())
- {
- return Boolean.valueOf(valueExpression.getExpressionString());
- }
-
- return (Boolean) valueExpression.getValue(elContext);
- }
-
- public static Integer getIntegerValue(ELContext elContext,
- ValueExpression valueExpression)
- {
- if (valueExpression.isLiteralText())
- {
- return Integer.valueOf(valueExpression.getExpressionString());
- }
-
- return (Integer) valueExpression.getValue(elContext);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared.taglib;
+
+import java.util.logging.Logger;
+
+import javax.el.ELContext;
+import javax.el.MethodExpression;
+import javax.el.ValueExpression;
+import javax.faces.component.ActionSource2;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIGraphic;
+import javax.faces.component.UIParameter;
+import javax.faces.component.UISelectBoolean;
+import javax.faces.component.ValueHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.event.MethodExpressionActionListener;
+import javax.faces.event.MethodExpressionValueChangeListener;
+import javax.faces.validator.MethodExpressionValidator;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author$)
+ * @author Bruno Aranda (JSR-252)
+ * @version $Revision$ $Date$
+ *
+ * @since 1.2
+ */
+public class UIComponentELTagUtils
+{
+ //private static final Log log = LogFactory.getLog(UIComponentELTagUtils.class);
+ private static final Logger log = Logger
+ .getLogger(UIComponentELTagUtils.class.getName());
+
+ private UIComponentELTagUtils()
+ {
+ } //util class, no instantiation allowed
+
+ /**
+ * @since 1.2
+ */
+ public static void setIntegerProperty(UIComponent component,
+ String propName, ValueExpression value)
+ {
+ setIntegerProperty(component, propName, value, null);
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setIntegerProperty(UIComponent component,
+ String propName, ValueExpression value, Integer defaultValue)
+ {
+ if (value != null)
+ {
+ if (value.isLiteralText())
+ {
+ component.getAttributes().put(propName,
+ Integer.valueOf(value.getExpressionString()));
+ }
+ else
+ {
+ component.setValueExpression(propName, value);
+ }
+ }
+ else
+ {
+ if (defaultValue != null)
+ {
+ component.getAttributes().put(propName, defaultValue);
+ }
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setLongProperty(UIComponent component, String propName,
+ ValueExpression value)
+ {
+ setLongProperty(component, propName, value, null);
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setLongProperty(UIComponent component, String propName,
+ ValueExpression value, Long defaultValue)
+ {
+ if (value != null)
+ {
+ if (value.isLiteralText())
+ {
+ component.getAttributes().put(propName,
+ Long.valueOf(value.getExpressionString()));
+ }
+ else
+ {
+ component.setValueExpression(propName, value);
+ }
+ }
+ else
+ {
+ if (defaultValue != null)
+ {
+ component.getAttributes().put(propName, defaultValue);
+ }
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setStringProperty(UIComponent component,
+ String propName, ValueExpression value)
+ {
+ setStringProperty(component, propName, value, null);
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setStringProperty(UIComponent component,
+ String propName, ValueExpression value, String defaultValue)
+ {
+ if (value != null)
+ {
+ if (value.isLiteralText())
+ {
+ component.getAttributes().put(propName,
+ value.getExpressionString());
+ }
+ else
+ {
+ component.setValueExpression(propName, value);
+ }
+ }
+ else
+ {
+ if (defaultValue != null)
+ {
+ component.getAttributes().put(propName, defaultValue);
+ }
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setBooleanProperty(UIComponent component,
+ String propName, ValueExpression value)
+ {
+ setBooleanProperty(component, propName, value, null);
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setBooleanProperty(UIComponent component,
+ String propName, ValueExpression value, Boolean defaultValue)
+ {
+ if (value != null)
+ {
+ if (value.isLiteralText())
+ {
+ component.getAttributes().put(propName,
+ Boolean.valueOf(value.getExpressionString()));
+ }
+ else
+ {
+ component.setValueExpression(propName, value);
+ }
+ }
+ else
+ {
+ if (defaultValue != null)
+ {
+ component.getAttributes().put(propName, defaultValue);
+ }
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setValueProperty(FacesContext context,
+ UIComponent component, ValueExpression value)
+ {
+ if (value != null)
+ {
+ if (!value.isLiteralText())
+ {
+ component.setValueExpression(
+ org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR,
+ value);
+ }
+ else if (component instanceof UICommand)
+ {
+ ((UICommand) component).setValue(value.getExpressionString());
+ }
+ else if (component instanceof UIParameter)
+ {
+ ((UIParameter) component).setValue(value.getExpressionString());
+ }
+ else if (component instanceof UISelectBoolean)
+ {
+ ((UISelectBoolean) component).setValue(Boolean.valueOf(value
+ .getExpressionString()));
+ }
+ else if (component instanceof UIGraphic)
+ {
+ ((UIGraphic) component).setValue(value.getExpressionString());
+ }
+ //Since many input components are ValueHolders the special components
+ //must come first, ValueHolder is the last resort.
+ else if (component instanceof ValueHolder)
+ {
+ ((ValueHolder) component).setValue(value.getExpressionString());
+ }
+ else
+ {
+ log.severe("Component " + component.getClass().getName()
+ + " is no ValueHolder, cannot set value.");
+ }
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setConverterProperty(FacesContext context,
+ UIComponent component, ValueExpression value)
+ {
+ if (value != null)
+ {
+ if (component instanceof ValueHolder)
+ {
+ if (value.isLiteralText())
+ {
+ FacesContext facesContext = FacesContext
+ .getCurrentInstance();
+ Converter converter = facesContext.getApplication()
+ .createConverter(value.getExpressionString());
+ ((ValueHolder) component).setConverter(converter);
+ }
+ else
+ {
+ component
+ .setValueExpression(
+ org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR,
+ value);
+ }
+ }
+ else
+ {
+ log.severe("Component " + component.getClass().getName()
+ + " is no ValueHolder, cannot set value.");
+ }
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void addValidatorProperty(FacesContext context,
+ UIComponent component, MethodExpression validator)
+ {
+ if (validator != null)
+ {
+ if (!(component instanceof EditableValueHolder))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no EditableValueHolder");
+ }
+
+ ((EditableValueHolder) component)
+ .addValidator(new MethodExpressionValidator(validator));
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setValueBinding(FacesContext context,
+ UIComponent component, String propName, ValueExpression value)
+ {
+ if (value != null)
+ {
+ if (!value.isLiteralText())
+ {
+ component.setValueExpression(propName, value);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context) + " attribute "
+ + propName + " must be a value reference, was " + value);
+ }
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void setActionProperty(FacesContext context,
+ UIComponent component, MethodExpression action)
+ {
+ if (action != null)
+ {
+ if (!(component instanceof ActionSource2))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no ActionSource2");
+ }
+
+ ((ActionSource2) component).setActionExpression(action);
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void addActionListenerProperty(FacesContext context,
+ UIComponent component, MethodExpression actionListener)
+ {
+ if (actionListener != null)
+ {
+ if (!(component instanceof ActionSource2))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no ActionSource");
+ }
+
+ ((ActionSource2) component)
+ .addActionListener(new MethodExpressionActionListener(
+ actionListener));
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static void addValueChangedListenerProperty(FacesContext context,
+ UIComponent component, MethodExpression valueChangedListener)
+ {
+ if (valueChangedListener != null)
+ {
+ if (!(component instanceof EditableValueHolder))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no EditableValueHolder");
+ }
+
+ ((EditableValueHolder) component)
+ .addValueChangeListener(new MethodExpressionValueChangeListener(
+ valueChangedListener));
+ }
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static Object evaluateValueExpression(ELContext elContext,
+ ValueExpression valueExpression)
+ {
+ return valueExpression.isLiteralText() ? valueExpression
+ .getExpressionString() : valueExpression.getValue(elContext);
+ }
+
+ /**
+ * @since 1.2
+ */
+ public static Boolean getBooleanValue(ELContext elContext,
+ ValueExpression valueExpression)
+ {
+ if (valueExpression.isLiteralText())
+ {
+ return Boolean.valueOf(valueExpression.getExpressionString());
+ }
+
+ return (Boolean) valueExpression.getValue(elContext);
+ }
+
+ public static Integer getIntegerValue(ELContext elContext,
+ ValueExpression valueExpression)
+ {
+ if (valueExpression.isLiteralText())
+ {
+ return Integer.valueOf(valueExpression.getExpressionString());
+ }
+
+ return (Integer) valueExpression.getValue(elContext);
+ }
+
+}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java?rev=1307565&r1=1307564&r2=1307565&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java Fri Mar 30 18:14:25 2012
@@ -1,361 +1,361 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.shared.taglib;
-
-import java.util.logging.Logger;
-
-import javax.faces.component.ActionSource;
-import javax.faces.component.EditableValueHolder;
-import javax.faces.component.UICommand;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIGraphic;
-import javax.faces.component.UIParameter;
-import javax.faces.component.UISelectBoolean;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.webapp.UIComponentTag;
-
-import org.apache.myfaces.shared.el.SimpleActionMethodBinding;
-
-/**
- * @author Manfred Geiler (latest modification by $Author$)
- * @version $Revision$ $Date$
- *
- * @deprecated replaced by @{link UIComponentELTagUtils}
- */
-public class UIComponentTagUtils
-{
- //private static final Log log = LogFactory.getLog(UIComponentTagUtils.class);
- private static final Logger log = Logger
- .getLogger(UIComponentTagUtils.class.getName());
-
- private static final Class[] VALIDATOR_ARGS = { FacesContext.class,
- UIComponent.class, Object.class };
- private static final Class[] ACTION_LISTENER_ARGS = { ActionEvent.class };
- private static final Class[] VALUE_LISTENER_ARGS = { ValueChangeEvent.class };
-
- private UIComponentTagUtils()
- {
- } //util class, no instantiation allowed
-
- public static boolean isValueReference(String v)
- {
- return UIComponentTag.isValueReference(v);
- }
-
- public static void setIntegerProperty(FacesContext context,
- UIComponent component, String propName, String value)
- {
- if (value != null)
- {
- if (isValueReference(value))
- {
- ValueBinding vb = context.getApplication().createValueBinding(
- value);
- component.setValueBinding(propName, vb);
- }
- else
- {
- //FIXME: should use converter maybe?
- component.getAttributes().put(propName, Integer.valueOf(value));
- }
- }
- }
-
- public static void setLongProperty(FacesContext context,
- UIComponent component, String propName, String value)
- {
- if (value != null)
- {
- if (isValueReference(value))
- {
- ValueBinding vb = context.getApplication().createValueBinding(
- value);
- component.setValueBinding(propName, vb);
- }
- else
- {
- //FIXME: should use converter maybe?
- component.getAttributes().put(propName, Long.valueOf(value));
- }
- }
- }
-
- public static void setStringProperty(FacesContext context,
- UIComponent component, String propName, String value)
- {
- if (value != null)
- {
- if (isValueReference(value))
- {
- ValueBinding vb = context.getApplication().createValueBinding(
- value);
- component.setValueBinding(propName, vb);
- }
- else
- {
- //TODO: Warning if component has no such property (with reflection)
- component.getAttributes().put(propName, value);
- }
- }
- }
-
- public static void setBooleanProperty(FacesContext context,
- UIComponent component, String propName, String value)
- {
- if (value != null)
- {
- if (isValueReference(value))
- {
- ValueBinding vb = context.getApplication().createValueBinding(
- value);
- component.setValueBinding(propName, vb);
- }
- else
- {
- //TODO: More sophisticated way to convert boolean value (yes/no, 1/0, on/off, etc.)
- component.getAttributes().put(propName, Boolean.valueOf(value));
- }
- }
- }
-
- public static void setValueProperty(FacesContext context,
- UIComponent component, String value)
- {
- if (value != null)
- {
- if (isValueReference(value))
- {
- ValueBinding vb = context.getApplication().createValueBinding(
- value);
- component.setValueBinding(
- org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR,
- vb);
- }
- else if (component instanceof UICommand)
- {
- ((UICommand) component).setValue(value);
- }
- else if (component instanceof UIParameter)
- {
- ((UIParameter) component).setValue(value);
- }
- else if (component instanceof UISelectBoolean)
- {
- ((UISelectBoolean) component).setValue(Boolean.valueOf(value));
- }
- else if (component instanceof UIGraphic)
- {
- ((UIGraphic) component).setValue(value);
- }
- //Since many input components are ValueHolders the special components
- //must come first, ValueHolder is the last resort.
- else if (component instanceof ValueHolder)
- {
- ((ValueHolder) component).setValue(value);
- }
- else
- {
- log.severe("Component " + component.getClass().getName()
- + " is no ValueHolder, cannot set value.");
- }
- }
- }
-
- public static void setConverterProperty(FacesContext context,
- UIComponent component, String value)
- {
- if (value != null)
- {
- if (component instanceof ValueHolder)
- {
- if (isValueReference(value))
- {
- ValueBinding vb = context.getApplication()
- .createValueBinding(value);
- component
- .setValueBinding(
- org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR,
- vb);
- }
- else
- {
- FacesContext facesContext = FacesContext
- .getCurrentInstance();
- Converter converter = facesContext.getApplication()
- .createConverter(value);
- ((ValueHolder) component).setConverter(converter);
- }
- }
- else
- {
- log.severe("Component " + component.getClass().getName()
- + " is no ValueHolder, cannot set value.");
- }
- }
- }
-
- public static void setValidatorProperty(FacesContext context,
- UIComponent component, String validator)
- {
- if (validator != null)
- {
- if (!(component instanceof EditableValueHolder))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no EditableValueHolder");
- }
- if (isValueReference(validator))
- {
- MethodBinding mb = context.getApplication()
- .createMethodBinding(validator, VALIDATOR_ARGS);
- ((EditableValueHolder) component).setValidator(mb);
- }
- else
- {
- log.severe("Component " + component.getClientId(context)
- + " has invalid validation expression " + validator);
- }
- }
- }
-
- public static void setValueBinding(FacesContext context,
- UIComponent component, String propName, String value)
- {
- if (value != null)
- {
- if (isValueReference(value))
- {
- ValueBinding vb = context.getApplication().createValueBinding(
- value);
- component.setValueBinding(propName, vb);
- }
- else
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context) + " attribute "
- + propName + " must be a value reference, was " + value);
- }
- }
- }
-
- public static void setActionProperty(FacesContext context,
- UIComponent component, String action)
- {
- if (action != null)
- {
- if (!(component instanceof ActionSource))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no ActionSource");
- }
- MethodBinding mb;
- if (isValueReference(action))
- {
- mb = context.getApplication().createMethodBinding(action, null);
- }
- else
- {
- mb = new SimpleActionMethodBinding(action);
- }
- ((ActionSource) component).setAction(mb);
- }
- }
-
- public static void setActionListenerProperty(FacesContext context,
- UIComponent component, String actionListener)
- {
- if (actionListener != null)
- {
- if (!(component instanceof ActionSource))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no ActionSource");
- }
- if (isValueReference(actionListener))
- {
- MethodBinding mb = context.getApplication()
- .createMethodBinding(actionListener,
- ACTION_LISTENER_ARGS);
-
- /**
- if(! Void.class.equals(mb.getType(context)))
- {
- throw new IllegalArgumentException(
- actionListener +
- " : Return types for action listeners must be void, see JSF spec. 3.2.1.1");
- }
- */
-
- ((ActionSource) component).setActionListener(mb);
- }
- else
- {
- log.severe("Component " + component.getClientId(context)
- + " has invalid actionListener value: "
- + actionListener);
- }
- }
- }
-
- public static void setValueChangedListenerProperty(FacesContext context,
- UIComponent component, String valueChangedListener)
- {
- if (valueChangedListener != null)
- {
- if (!(component instanceof EditableValueHolder))
- {
- throw new IllegalArgumentException("Component "
- + component.getClientId(context)
- + " is no EditableValueHolder");
- }
- if (isValueReference(valueChangedListener))
- {
- MethodBinding mb = context.getApplication()
- .createMethodBinding(valueChangedListener,
- VALUE_LISTENER_ARGS);
- /**
- if(! Void.class.equals(mb.getType(context)))
- {
- throw new IllegalArgumentException(
- valueChangedListener +
- " : Return types for value change listeners must be void, see JSF spec. 3.2.5.1");
- }
- */
-
- ((EditableValueHolder) component).setValueChangeListener(mb);
- }
- else
- {
- log.severe("Component " + component.getClientId(context)
- + " has invalid valueChangedListener expression "
- + valueChangedListener);
- }
- }
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared.taglib;
+
+import java.util.logging.Logger;
+
+import javax.faces.component.ActionSource;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIGraphic;
+import javax.faces.component.UIParameter;
+import javax.faces.component.UISelectBoolean;
+import javax.faces.component.ValueHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.webapp.UIComponentTag;
+
+import org.apache.myfaces.shared.el.SimpleActionMethodBinding;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ *
+ * @deprecated replaced by @{link UIComponentELTagUtils}
+ */
+public class UIComponentTagUtils
+{
+ //private static final Log log = LogFactory.getLog(UIComponentTagUtils.class);
+ private static final Logger log = Logger
+ .getLogger(UIComponentTagUtils.class.getName());
+
+ private static final Class[] VALIDATOR_ARGS = { FacesContext.class,
+ UIComponent.class, Object.class };
+ private static final Class[] ACTION_LISTENER_ARGS = { ActionEvent.class };
+ private static final Class[] VALUE_LISTENER_ARGS = { ValueChangeEvent.class };
+
+ private UIComponentTagUtils()
+ {
+ } //util class, no instantiation allowed
+
+ public static boolean isValueReference(String v)
+ {
+ return UIComponentTag.isValueReference(v);
+ }
+
+ public static void setIntegerProperty(FacesContext context,
+ UIComponent component, String propName, String value)
+ {
+ if (value != null)
+ {
+ if (isValueReference(value))
+ {
+ ValueBinding vb = context.getApplication().createValueBinding(
+ value);
+ component.setValueBinding(propName, vb);
+ }
+ else
+ {
+ //FIXME: should use converter maybe?
+ component.getAttributes().put(propName, Integer.valueOf(value));
+ }
+ }
+ }
+
+ public static void setLongProperty(FacesContext context,
+ UIComponent component, String propName, String value)
+ {
+ if (value != null)
+ {
+ if (isValueReference(value))
+ {
+ ValueBinding vb = context.getApplication().createValueBinding(
+ value);
+ component.setValueBinding(propName, vb);
+ }
+ else
+ {
+ //FIXME: should use converter maybe?
+ component.getAttributes().put(propName, Long.valueOf(value));
+ }
+ }
+ }
+
+ public static void setStringProperty(FacesContext context,
+ UIComponent component, String propName, String value)
+ {
+ if (value != null)
+ {
+ if (isValueReference(value))
+ {
+ ValueBinding vb = context.getApplication().createValueBinding(
+ value);
+ component.setValueBinding(propName, vb);
+ }
+ else
+ {
+ //TODO: Warning if component has no such property (with reflection)
+ component.getAttributes().put(propName, value);
+ }
+ }
+ }
+
+ public static void setBooleanProperty(FacesContext context,
+ UIComponent component, String propName, String value)
+ {
+ if (value != null)
+ {
+ if (isValueReference(value))
+ {
+ ValueBinding vb = context.getApplication().createValueBinding(
+ value);
+ component.setValueBinding(propName, vb);
+ }
+ else
+ {
+ //TODO: More sophisticated way to convert boolean value (yes/no, 1/0, on/off, etc.)
+ component.getAttributes().put(propName, Boolean.valueOf(value));
+ }
+ }
+ }
+
+ public static void setValueProperty(FacesContext context,
+ UIComponent component, String value)
+ {
+ if (value != null)
+ {
+ if (isValueReference(value))
+ {
+ ValueBinding vb = context.getApplication().createValueBinding(
+ value);
+ component.setValueBinding(
+ org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR,
+ vb);
+ }
+ else if (component instanceof UICommand)
+ {
+ ((UICommand) component).setValue(value);
+ }
+ else if (component instanceof UIParameter)
+ {
+ ((UIParameter) component).setValue(value);
+ }
+ else if (component instanceof UISelectBoolean)
+ {
+ ((UISelectBoolean) component).setValue(Boolean.valueOf(value));
+ }
+ else if (component instanceof UIGraphic)
+ {
+ ((UIGraphic) component).setValue(value);
+ }
+ //Since many input components are ValueHolders the special components
+ //must come first, ValueHolder is the last resort.
+ else if (component instanceof ValueHolder)
+ {
+ ((ValueHolder) component).setValue(value);
+ }
+ else
+ {
+ log.severe("Component " + component.getClass().getName()
+ + " is no ValueHolder, cannot set value.");
+ }
+ }
+ }
+
+ public static void setConverterProperty(FacesContext context,
+ UIComponent component, String value)
+ {
+ if (value != null)
+ {
+ if (component instanceof ValueHolder)
+ {
+ if (isValueReference(value))
+ {
+ ValueBinding vb = context.getApplication()
+ .createValueBinding(value);
+ component
+ .setValueBinding(
+ org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR,
+ vb);
+ }
+ else
+ {
+ FacesContext facesContext = FacesContext
+ .getCurrentInstance();
+ Converter converter = facesContext.getApplication()
+ .createConverter(value);
+ ((ValueHolder) component).setConverter(converter);
+ }
+ }
+ else
+ {
+ log.severe("Component " + component.getClass().getName()
+ + " is no ValueHolder, cannot set value.");
+ }
+ }
+ }
+
+ public static void setValidatorProperty(FacesContext context,
+ UIComponent component, String validator)
+ {
+ if (validator != null)
+ {
+ if (!(component instanceof EditableValueHolder))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no EditableValueHolder");
+ }
+ if (isValueReference(validator))
+ {
+ MethodBinding mb = context.getApplication()
+ .createMethodBinding(validator, VALIDATOR_ARGS);
+ ((EditableValueHolder) component).setValidator(mb);
+ }
+ else
+ {
+ log.severe("Component " + component.getClientId(context)
+ + " has invalid validation expression " + validator);
+ }
+ }
+ }
+
+ public static void setValueBinding(FacesContext context,
+ UIComponent component, String propName, String value)
+ {
+ if (value != null)
+ {
+ if (isValueReference(value))
+ {
+ ValueBinding vb = context.getApplication().createValueBinding(
+ value);
+ component.setValueBinding(propName, vb);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context) + " attribute "
+ + propName + " must be a value reference, was " + value);
+ }
+ }
+ }
+
+ public static void setActionProperty(FacesContext context,
+ UIComponent component, String action)
+ {
+ if (action != null)
+ {
+ if (!(component instanceof ActionSource))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no ActionSource");
+ }
+ MethodBinding mb;
+ if (isValueReference(action))
+ {
+ mb = context.getApplication().createMethodBinding(action, null);
+ }
+ else
+ {
+ mb = new SimpleActionMethodBinding(action);
+ }
+ ((ActionSource) component).setAction(mb);
+ }
+ }
+
+ public static void setActionListenerProperty(FacesContext context,
+ UIComponent component, String actionListener)
+ {
+ if (actionListener != null)
+ {
+ if (!(component instanceof ActionSource))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no ActionSource");
+ }
+ if (isValueReference(actionListener))
+ {
+ MethodBinding mb = context.getApplication()
+ .createMethodBinding(actionListener,
+ ACTION_LISTENER_ARGS);
+
+ /**
+ if(! Void.class.equals(mb.getType(context)))
+ {
+ throw new IllegalArgumentException(
+ actionListener +
+ " : Return types for action listeners must be void, see JSF spec. 3.2.1.1");
+ }
+ */
+
+ ((ActionSource) component).setActionListener(mb);
+ }
+ else
+ {
+ log.severe("Component " + component.getClientId(context)
+ + " has invalid actionListener value: "
+ + actionListener);
+ }
+ }
+ }
+
+ public static void setValueChangedListenerProperty(FacesContext context,
+ UIComponent component, String valueChangedListener)
+ {
+ if (valueChangedListener != null)
+ {
+ if (!(component instanceof EditableValueHolder))
+ {
+ throw new IllegalArgumentException("Component "
+ + component.getClientId(context)
+ + " is no EditableValueHolder");
+ }
+ if (isValueReference(valueChangedListener))
+ {
+ MethodBinding mb = context.getApplication()
+ .createMethodBinding(valueChangedListener,
+ VALUE_LISTENER_ARGS);
+ /**
+ if(! Void.class.equals(mb.getType(context)))
+ {
+ throw new IllegalArgumentException(
+ valueChangedListener +
+ " : Return types for value change listeners must be void, see JSF spec. 3.2.5.1");
+ }
+ */
+
+ ((EditableValueHolder) component).setValueChangeListener(mb);
+ }
+ else
+ {
+ log.severe("Component " + component.getClientId(context)
+ + " has invalid valueChangedListener expression "
+ + valueChangedListener);
+ }
+ }
+ }
+
+}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java?rev=1307565&r1=1307564&r2=1307565&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/SelectItemTagBase.java Fri Mar 30 18:14:25 2012
@@ -1,107 +1,107 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.shared.taglib.core;
-
-import org.apache.myfaces.shared.renderkit.JSFAttr;
-
-import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-
-/**
- * @author Thomas Spiegl (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-public class SelectItemTagBase
- extends org.apache.myfaces.shared.taglib.UIComponentELTagBase
-{
- //private static final Log log = LogFactory.getLog(SelectItemTag.class);
-
- public String getComponentType()
- {
- return "javax.faces.SelectItem";
- }
-
- public String getRendererType()
- {
- return null;
- }
-
- // UISelectItem attributes
- private ValueExpression _itemDisabled;
- private ValueExpression _itemDescription;
- private ValueExpression _itemLabel;
- private ValueExpression _itemValue;
- private ValueExpression _escape;
- private ValueExpression _noSelectionOption;
-
- protected void setProperties(UIComponent component)
- {
- super.setProperties(component);
-
- setBooleanProperty(component, JSFAttr.ITEM_DISABLED_ATTR, _itemDisabled);
- setStringProperty(component, JSFAttr.ITEM_DESCRIPTION_ATTR, _itemDescription);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.ITEM_LABEL_ATTR, _itemLabel);
- setStringProperty(component, JSFAttr.ITEM_VALUE_ATTR, _itemValue);
- setBooleanProperty(component, JSFAttr.ITEM_ESCAPED_ATTR, _escape, Boolean.TRUE);
- setBooleanProperty(component, JSFAttr.NO_SELECTION_OPTION_ATTR, _noSelectionOption, Boolean.FALSE);
- }
-
- public void setItemDisabled(ValueExpression itemDisabled)
- {
- _itemDisabled = itemDisabled;
- }
-
- public void setItemDescription(ValueExpression itemDescription)
- {
- _itemDescription = itemDescription;
- }
-
- public void setItemLabel(ValueExpression itemLabel)
- {
- _itemLabel = itemLabel;
- }
-
- @Deprecated
- protected void setItemValue(String itemValue)
- {
- _itemValue = getFacesContext().getApplication().getExpressionFactory().createValueExpression(
- getFacesContext().getELContext(),itemValue,String.class);
- }
-
- public void setItemValue(ValueExpression itemValue)
- {
- _itemValue = itemValue;
- }
-
- public void setEscape(ValueExpression escape)
- {
- _escape = escape;
- }
-
- protected ValueExpression getItemValue()
- {
- return _itemValue;
- }
-
- public void setNoSelectionOption(ValueExpression noSelectionOption)
- {
- _noSelectionOption = noSelectionOption;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared.taglib.core;
+
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+
+import javax.el.ValueExpression;
+import javax.faces.component.UIComponent;
+
+/**
+ * @author Thomas Spiegl (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class SelectItemTagBase
+ extends org.apache.myfaces.shared.taglib.UIComponentELTagBase
+{
+ //private static final Log log = LogFactory.getLog(SelectItemTag.class);
+
+ public String getComponentType()
+ {
+ return "javax.faces.SelectItem";
+ }
+
+ public String getRendererType()
+ {
+ return null;
+ }
+
+ // UISelectItem attributes
+ private ValueExpression _itemDisabled;
+ private ValueExpression _itemDescription;
+ private ValueExpression _itemLabel;
+ private ValueExpression _itemValue;
+ private ValueExpression _escape;
+ private ValueExpression _noSelectionOption;
+
+ protected void setProperties(UIComponent component)
+ {
+ super.setProperties(component);
+
+ setBooleanProperty(component, JSFAttr.ITEM_DISABLED_ATTR, _itemDisabled);
+ setStringProperty(component, JSFAttr.ITEM_DESCRIPTION_ATTR, _itemDescription);
+ setStringProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.ITEM_LABEL_ATTR, _itemLabel);
+ setStringProperty(component, JSFAttr.ITEM_VALUE_ATTR, _itemValue);
+ setBooleanProperty(component, JSFAttr.ITEM_ESCAPED_ATTR, _escape, Boolean.TRUE);
+ setBooleanProperty(component, JSFAttr.NO_SELECTION_OPTION_ATTR, _noSelectionOption, Boolean.FALSE);
+ }
+
+ public void setItemDisabled(ValueExpression itemDisabled)
+ {
+ _itemDisabled = itemDisabled;
+ }
+
+ public void setItemDescription(ValueExpression itemDescription)
+ {
+ _itemDescription = itemDescription;
+ }
+
+ public void setItemLabel(ValueExpression itemLabel)
+ {
+ _itemLabel = itemLabel;
+ }
+
+ @Deprecated
+ protected void setItemValue(String itemValue)
+ {
+ _itemValue = getFacesContext().getApplication().getExpressionFactory().createValueExpression(
+ getFacesContext().getELContext(),itemValue,String.class);
+ }
+
+ public void setItemValue(ValueExpression itemValue)
+ {
+ _itemValue = itemValue;
+ }
+
+ public void setEscape(ValueExpression escape)
+ {
+ _escape = escape;
+ }
+
+ protected ValueExpression getItemValue()
+ {
+ return _itemValue;
+ }
+
+ public void setNoSelectionOption(ValueExpression noSelectionOption)
+ {
+ _noSelectionOption = noSelectionOption;
+ }
+
+}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java?rev=1307565&r1=1307564&r2=1307565&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java Fri Mar 30 18:14:25 2012
@@ -1,52 +1,52 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.shared.util;
-
-import java.io.Serializable;
-
-/**
- * @author Leonardo Uribe (latest modification by $Author: lu4242 $)
- * @version $Revision: 788877 $ $Date: 2009-06-26 16:30:38 -0500 (vie, 26 jun 2009) $
- */
-public class AttachedDeltaWrapper implements Serializable
-{
- private static final long serialVersionUID = 4732389964367986402L;
-
- private Object _wrappedStateObject;
-
- /**
- * @param clazz
- * null means wrappedStateObject is a List of state objects
- * @param wrappedStateObject
- */
- public AttachedDeltaWrapper(Class<?> clazz, Object wrappedStateObject)
- {
- if (wrappedStateObject != null && !(wrappedStateObject instanceof Serializable))
- {
- throw new IllegalArgumentException("Attached state for Object of type " + clazz + " (Class "
- + wrappedStateObject.getClass().getName() + ") is not serializable");
- }
- _wrappedStateObject = wrappedStateObject;
- }
-
- public Object getWrappedStateObject()
- {
- return _wrappedStateObject;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.shared.util;
+
+import java.io.Serializable;
+
+/**
+ * @author Leonardo Uribe (latest modification by $Author: lu4242 $)
+ * @version $Revision: 788877 $ $Date: 2009-06-26 16:30:38 -0500 (vie, 26 jun 2009) $
+ */
+public class AttachedDeltaWrapper implements Serializable
+{
+ private static final long serialVersionUID = 4732389964367986402L;
+
+ private Object _wrappedStateObject;
+
+ /**
+ * @param clazz
+ * null means wrappedStateObject is a List of state objects
+ * @param wrappedStateObject
+ */
+ public AttachedDeltaWrapper(Class<?> clazz, Object wrappedStateObject)
+ {
+ if (wrappedStateObject != null && !(wrappedStateObject instanceof Serializable))
+ {
+ throw new IllegalArgumentException("Attached state for Object of type " + clazz + " (Class "
+ + wrappedStateObject.getClass().getName() + ") is not serializable");
+ }
+ _wrappedStateObject = wrappedStateObject;
+ }
+
+ public Object getWrappedStateObject()
+ {
+ return _wrappedStateObject;
+ }
+}
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java?rev=1307565&r1=1307564&r2=1307565&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java Fri Mar 30 18:14:25 2012
@@ -1,80 +1,80 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.myfaces.shared.util;
-
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
-
-/**
- *
- * @since 1.0.2
- */
-public class ComponentUtils
-{
-
- /**
- * Return the parent NamingContainer of the component passed as argument.
- *
- * @param component
- * @return
- */
- public static UIComponent findParentNamingContainer(UIComponent component)
- {
- return findParentNamingContainer(component, true);
- }
-
- /**
- * Return the parent NamingContainer of the component passed as argument.
- *
- * @param component
- * @param returnRootIfNotFound
- * @return
- */
- public static UIComponent findParentNamingContainer(UIComponent component, boolean returnRootIfNotFound)
- {
- UIComponent parent = component.getParent();
- if (returnRootIfNotFound && parent == null)
- {
- return component;
- }
- while (parent != null)
- {
- if (parent instanceof NamingContainer)
- {
- return parent;
- }
-
- if (returnRootIfNotFound)
- {
- UIComponent nextParent = parent.getParent();
- if (nextParent == null)
- {
- return parent; // Root
- }
- parent = nextParent;
- }
- else
- {
- parent = parent.getParent();
- }
- }
- return null;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.shared.util;
+
+import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+
+/**
+ *
+ * @since 1.0.2
+ */
+public class ComponentUtils
+{
+
+ /**
+ * Return the parent NamingContainer of the component passed as argument.
+ *
+ * @param component
+ * @return
+ */
+ public static UIComponent findParentNamingContainer(UIComponent component)
+ {
+ return findParentNamingContainer(component, true);
+ }
+
+ /**
+ * Return the parent NamingContainer of the component passed as argument.
+ *
+ * @param component
+ * @param returnRootIfNotFound
+ * @return
+ */
+ public static UIComponent findParentNamingContainer(UIComponent component, boolean returnRootIfNotFound)
+ {
+ UIComponent parent = component.getParent();
+ if (returnRootIfNotFound && parent == null)
+ {
+ return component;
+ }
+ while (parent != null)
+ {
+ if (parent instanceof NamingContainer)
+ {
+ return parent;
+ }
+
+ if (returnRootIfNotFound)
+ {
+ UIComponent nextParent = parent.getParent();
+ if (nextParent == null)
+ {
+ return parent; // Root
+ }
+ parent = nextParent;
+ }
+ else
+ {
+ parent = parent.getParent();
+ }
+ }
+ return null;
+ }
+}