You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/04 00:15:47 UTC

svn commit: r673847 [1/3] - in /myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component: ./ html/

Author: skitching
Date: Thu Jul  3 15:15:26 2008
New Revision: 673847

URL: http://svn.apache.org/viewvc?rev=673847&view=rev
Log:
Fix files that contain both windows and unix linefeeds

Modified:
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UINamingContainer.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIOutput.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIPanel.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectBoolean.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectOne.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessage.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessages.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIParameter.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UISelectItem.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UISelectItems.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/HtmlInputHidden.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlColumn.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlDataTable.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlForm.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlGraphicImage.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlInputSecret.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlInputText.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlInputTextarea.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlMessage.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlMessages.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlOutputFormat.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlOutputLabel.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlOutputLink.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlOutputText.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlPanelGrid.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlPanelGroup.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlSelectBooleanCheckbox.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlSelectManyCheckbox.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlSelectManyListbox.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlSelectManyMenu.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlSelectOneListbox.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlSelectOneMenu.java
    myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/html/_HtmlSelectOneRadio.java

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UICommand.java Thu Jul  3 15:15:26 2008
@@ -19,59 +19,59 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import javax.el.MethodExpression;
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ActionListener;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.PhaseId;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UICommand is a base abstraction for components that implement ActionSource.
- *
- * <h4>Events:</h4>
- * <table border="1" width="100%" cellpadding="3" summary="">
- * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
- * <th align="left">Type</th>
- * <th align="left">Phases</th>
- * <th align="left">Description</th>
- * </tr>
- * <tr class="TableRowColor">
- * <td valign="top"><code>javax.faces.event.ActionEvent</code></td>
- * <td valign="top" nowrap>Invoke Application<br>Apply Request Values</td>
- * <td valign="top">Event delivered when the "action" of the component has been
-invoked;  for example, by clicking on a button.  The action may result
-in page navigation.</td>
- * </tr>
- * </table>
- */
-@JSFComponent
-(defaultRendererType = "javax.faces.Button"
-)
-public class UICommand extends UIComponentBase
-                       implements ActionSource2
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Command";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Command";
-
-  /**
-   * Construct an instance of the UICommand.
-   */
-  public UICommand()
-  {
-    setRendererType("javax.faces.Button");
-  }
+package javax.faces.component;
+
+import javax.el.MethodExpression;
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ActionListener;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseId;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ *
+ * UICommand is a base abstraction for components that implement ActionSource.
+ *
+ * <h4>Events:</h4>
+ * <table border="1" width="100%" cellpadding="3" summary="">
+ * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+ * <th align="left">Type</th>
+ * <th align="left">Phases</th>
+ * <th align="left">Description</th>
+ * </tr>
+ * <tr class="TableRowColor">
+ * <td valign="top"><code>javax.faces.event.ActionEvent</code></td>
+ * <td valign="top" nowrap>Invoke Application<br>Apply Request Values</td>
+ * <td valign="top">Event delivered when the "action" of the component has been
+invoked;  for example, by clicking on a button.  The action may result
+in page navigation.</td>
+ * </tr>
+ * </table>
+ */
+@JSFComponent
+(defaultRendererType = "javax.faces.Button"
+)
+public class UICommand extends UIComponentBase
+                       implements ActionSource2
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Command";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Command";
+
+  /**
+   * Construct an instance of the UICommand.
+   */
+  public UICommand()
+  {
+    setRendererType("javax.faces.Button");
+  }
   
 
     /**
@@ -146,246 +146,246 @@
         }
         super.queueEvent(event);
     }
-
-  // Property: immediate
-  private boolean _immediate;
-  private boolean _immediateSet;
-
-  /**
-   * Gets A boolean value that identifies the phase during which action events
-   *         should fire. During normal event processing, action methods and
-   *         action listener methods are fired during the "invoke application"
-   *         phase of request processing. If this attribute is set to "true",
-   *         these methods are fired instead at the end of the "apply request
-   *         values" phase.
-   *
-   * @return  the new immediate value
-   */
-  @JSFProperty
-  public boolean isImmediate()
-  {
-    if (_immediateSet)
-    {
-      return _immediate;
-    }
-    ValueExpression expression = getValueExpression("immediate");
-    if (expression != null)
-    {
-      return (Boolean)expression.getValue(getFacesContext().getELContext());
-    }
-    return false;
-  }
-
-  /**
-   * Sets A boolean value that identifies the phase during which action events
-   *         should fire. During normal event processing, action methods and
-   *         action listener methods are fired during the "invoke application"
-   *         phase of request processing. If this attribute is set to "true",
-   *         these methods are fired instead at the end of the "apply request
-   *         values" phase.
-   * 
-   * @param immediate  the new immediate value
-   */
-  public void setImmediate(boolean immediate)
-  {
-    this._immediate = immediate;
-    this._immediateSet = true;
-  }
-
-  // Property: value
-  private Object _value;
-
-  /**
-   * Gets The initial value of this component.
-   *
-   * @return  the new value value
-   */
-  @JSFProperty
-  public Object getValue()
-  {
-    if (_value != null)
-    {
-      return _value;
-    }
-    ValueExpression expression = getValueExpression("value");
-    if (expression != null)
-    {
-      return expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets The initial value of this component.
-   * 
-   * @param value  the new value value
-   */
-  public void setValue(Object value)
-  {
-    this._value = value;
-  }
-
-  // Property: actionExpression
-  private MethodExpression _actionExpression;
-
-  /**
-   * Gets Specifies the action to take when this command is invoked.
-   *         If the value is an expression, it is expected to be a method
-   *         binding EL expression that identifies an action method. An action method
-   *         accepts no parameters and has a String return value, called the action
-   *         outcome, that identifies the next view displayed. The phase that this
-   *         event is fired in can be controlled via the immediate attribute.
-   * 
-   *         If the value is a string literal, it is treated as a navigation outcome
-   *         for the current view.  This is functionally equivalent to a reference to
-   *         an action method that returns the string literal.
-   *
-   * @return  the new actionExpression value
-   */
-  @JSFProperty
-  (stateHolder = true,
-  returnSignature = "java.lang.Object",
-  jspName = "action")
-  public MethodExpression getActionExpression()
-  {
-    if (_actionExpression != null)
-    {
-      return _actionExpression;
-    }
-    ValueExpression expression = getValueExpression("actionExpression");
-    if (expression != null)
-    {
-      return (MethodExpression)expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets Specifies the action to take when this command is invoked.
-   *         If the value is an expression, it is expected to be a method
-   *         binding EL expression that identifies an action method. An action method
-   *         accepts no parameters and has a String return value, called the action
-   *         outcome, that identifies the next view displayed. The phase that this
-   *         event is fired in can be controlled via the immediate attribute.
-   * 
-   *         If the value is a string literal, it is treated as a navigation outcome
-   *         for the current view.  This is functionally equivalent to a reference to
-   *         an action method that returns the string literal.
-   * 
-   * @param actionExpression  the new actionExpression value
-   */
-  public void setActionExpression(MethodExpression actionExpression)
-  {
-    this._actionExpression = actionExpression;
-  }
-
-  // Property: actionListener
-  private MethodBinding _actionListener;
-
-  /**
-   * Gets A method binding EL expression that identifies an action listener method
-   *         to be invoked if this component is activated by the user. An action
-   *         listener method accepts a parameter of type javax.faces.event.ActionEvent
-   *         and returns void. The phase that this event is fired in can be controlled
-   *         via the immediate attribute.
-   *
-   * @return  the new actionListener value
-   * @deprecated
-   */
-  @JSFProperty
-  (stateHolder = true,
-  returnSignature = "void",
-  methodSignature = "javax.faces.event.ActionEvent")
-  public MethodBinding getActionListener()
-  {
-    if (_actionListener != null)
-    {
-      return _actionListener;
-    }
-    ValueExpression expression = getValueExpression("actionListener");
-    if (expression != null)
-    {
-      return (MethodBinding)expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets A method binding EL expression that identifies an action listener method
-   *         to be invoked if this component is activated by the user. An action
-   *         listener method accepts a parameter of type javax.faces.event.ActionEvent
-   *         and returns void. The phase that this event is fired in can be controlled
-   *         via the immediate attribute.
-   * 
-   * @param actionListener  the new actionListener value
-   * @deprecated
-   */
-  public void setActionListener(MethodBinding actionListener)
-  {
-    this._actionListener = actionListener;
-  }
-
-  /**
-   * Adds a action listener.
-   *
-   * @param listener  the action listener to add
-   */
-  public void addActionListener(
-    ActionListener listener)
-  {
-    addFacesListener(listener);
-  }
-
-  /**
-   * Removes a action listener.
-   *
-   * @param listener  the action listener to remove
-   */
-  public void removeActionListener(
-    ActionListener listener)
-  {
-    removeFacesListener(listener);
-  }
-
-  /**
-   * Returns an array of attached action listeners.
-   *
-   * @return  an array of attached action listeners.
-   */
-  public ActionListener[] getActionListeners()
-  {
-    return (ActionListener[])getFacesListeners(ActionListener.class);
-  }
-
-  @Override
-  public Object saveState(FacesContext facesContext)
-  {
-    Object[] values = new Object[6];
-    values[0] = super.saveState(facesContext);
-    values[1] = _immediate;
-    values[2] = _immediateSet;
-    values[3] = _value;
-    values[4] = saveAttachedState(facesContext, _actionExpression);
-    values[5] = saveAttachedState(facesContext, _actionListener);
-
-    return values;
-  }
-
-  @Override
-  public void restoreState(FacesContext facesContext, Object state)
-  {
-    Object[] values = (Object[])state;
-    super.restoreState(facesContext,values[0]);
-    _immediate = (Boolean)values[1];
-    _immediateSet = (Boolean)values[2];
-    _value = values[3];
-    _actionExpression = (MethodExpression)restoreAttachedState(facesContext, values[4]);
-    _actionListener = (MethodBinding)restoreAttachedState(facesContext, values[5]);
-  }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+
+  // Property: immediate
+  private boolean _immediate;
+  private boolean _immediateSet;
+
+  /**
+   * Gets A boolean value that identifies the phase during which action events
+   *         should fire. During normal event processing, action methods and
+   *         action listener methods are fired during the "invoke application"
+   *         phase of request processing. If this attribute is set to "true",
+   *         these methods are fired instead at the end of the "apply request
+   *         values" phase.
+   *
+   * @return  the new immediate value
+   */
+  @JSFProperty
+  public boolean isImmediate()
+  {
+    if (_immediateSet)
+    {
+      return _immediate;
+    }
+    ValueExpression expression = getValueExpression("immediate");
+    if (expression != null)
+    {
+      return (Boolean)expression.getValue(getFacesContext().getELContext());
+    }
+    return false;
+  }
+
+  /**
+   * Sets A boolean value that identifies the phase during which action events
+   *         should fire. During normal event processing, action methods and
+   *         action listener methods are fired during the "invoke application"
+   *         phase of request processing. If this attribute is set to "true",
+   *         these methods are fired instead at the end of the "apply request
+   *         values" phase.
+   * 
+   * @param immediate  the new immediate value
+   */
+  public void setImmediate(boolean immediate)
+  {
+    this._immediate = immediate;
+    this._immediateSet = true;
+  }
+
+  // Property: value
+  private Object _value;
+
+  /**
+   * Gets The initial value of this component.
+   *
+   * @return  the new value value
+   */
+  @JSFProperty
+  public Object getValue()
+  {
+    if (_value != null)
+    {
+      return _value;
+    }
+    ValueExpression expression = getValueExpression("value");
+    if (expression != null)
+    {
+      return expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets The initial value of this component.
+   * 
+   * @param value  the new value value
+   */
+  public void setValue(Object value)
+  {
+    this._value = value;
+  }
+
+  // Property: actionExpression
+  private MethodExpression _actionExpression;
+
+  /**
+   * Gets Specifies the action to take when this command is invoked.
+   *         If the value is an expression, it is expected to be a method
+   *         binding EL expression that identifies an action method. An action method
+   *         accepts no parameters and has a String return value, called the action
+   *         outcome, that identifies the next view displayed. The phase that this
+   *         event is fired in can be controlled via the immediate attribute.
+   * 
+   *         If the value is a string literal, it is treated as a navigation outcome
+   *         for the current view.  This is functionally equivalent to a reference to
+   *         an action method that returns the string literal.
+   *
+   * @return  the new actionExpression value
+   */
+  @JSFProperty
+  (stateHolder = true,
+  returnSignature = "java.lang.Object",
+  jspName = "action")
+  public MethodExpression getActionExpression()
+  {
+    if (_actionExpression != null)
+    {
+      return _actionExpression;
+    }
+    ValueExpression expression = getValueExpression("actionExpression");
+    if (expression != null)
+    {
+      return (MethodExpression)expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets Specifies the action to take when this command is invoked.
+   *         If the value is an expression, it is expected to be a method
+   *         binding EL expression that identifies an action method. An action method
+   *         accepts no parameters and has a String return value, called the action
+   *         outcome, that identifies the next view displayed. The phase that this
+   *         event is fired in can be controlled via the immediate attribute.
+   * 
+   *         If the value is a string literal, it is treated as a navigation outcome
+   *         for the current view.  This is functionally equivalent to a reference to
+   *         an action method that returns the string literal.
+   * 
+   * @param actionExpression  the new actionExpression value
+   */
+  public void setActionExpression(MethodExpression actionExpression)
+  {
+    this._actionExpression = actionExpression;
+  }
+
+  // Property: actionListener
+  private MethodBinding _actionListener;
+
+  /**
+   * Gets A method binding EL expression that identifies an action listener method
+   *         to be invoked if this component is activated by the user. An action
+   *         listener method accepts a parameter of type javax.faces.event.ActionEvent
+   *         and returns void. The phase that this event is fired in can be controlled
+   *         via the immediate attribute.
+   *
+   * @return  the new actionListener value
+   * @deprecated
+   */
+  @JSFProperty
+  (stateHolder = true,
+  returnSignature = "void",
+  methodSignature = "javax.faces.event.ActionEvent")
+  public MethodBinding getActionListener()
+  {
+    if (_actionListener != null)
+    {
+      return _actionListener;
+    }
+    ValueExpression expression = getValueExpression("actionListener");
+    if (expression != null)
+    {
+      return (MethodBinding)expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets A method binding EL expression that identifies an action listener method
+   *         to be invoked if this component is activated by the user. An action
+   *         listener method accepts a parameter of type javax.faces.event.ActionEvent
+   *         and returns void. The phase that this event is fired in can be controlled
+   *         via the immediate attribute.
+   * 
+   * @param actionListener  the new actionListener value
+   * @deprecated
+   */
+  public void setActionListener(MethodBinding actionListener)
+  {
+    this._actionListener = actionListener;
+  }
+
+  /**
+   * Adds a action listener.
+   *
+   * @param listener  the action listener to add
+   */
+  public void addActionListener(
+    ActionListener listener)
+  {
+    addFacesListener(listener);
+  }
+
+  /**
+   * Removes a action listener.
+   *
+   * @param listener  the action listener to remove
+   */
+  public void removeActionListener(
+    ActionListener listener)
+  {
+    removeFacesListener(listener);
+  }
+
+  /**
+   * Returns an array of attached action listeners.
+   *
+   * @return  an array of attached action listeners.
+   */
+  public ActionListener[] getActionListeners()
+  {
+    return (ActionListener[])getFacesListeners(ActionListener.class);
+  }
+
+  @Override
+  public Object saveState(FacesContext facesContext)
+  {
+    Object[] values = new Object[6];
+    values[0] = super.saveState(facesContext);
+    values[1] = _immediate;
+    values[2] = _immediateSet;
+    values[3] = _value;
+    values[4] = saveAttachedState(facesContext, _actionExpression);
+    values[5] = saveAttachedState(facesContext, _actionListener);
+
+    return values;
+  }
+
+  @Override
+  public void restoreState(FacesContext facesContext, Object state)
+  {
+    Object[] values = (Object[])state;
+    super.restoreState(facesContext,values[0]);
+    _immediate = (Boolean)values[1];
+    _immediateSet = (Boolean)values[2];
+    _value = values[3];
+    _actionExpression = (MethodExpression)restoreAttachedState(facesContext, values[4]);
+    _actionListener = (MethodBinding)restoreAttachedState(facesContext, values[5]);
+  }
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIData.java Thu Jul  3 15:15:26 2008
@@ -19,47 +19,47 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.util.*;
-import javax.el.ValueExpression;
-import javax.faces.FacesException;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.AbortProcessingException;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
-import javax.faces.event.PhaseId;
-import javax.faces.model.*;
-import javax.servlet.jsp.jstl.sql.Result;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UIData is a base abstraction for components that holds Data.
- */
-@JSFComponent
-(defaultRendererType = "javax.faces.Table"
-)
-public class UIData extends UIComponentBase
-                    implements NamingContainer
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Data";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Data";
-
-  /**
-   * Construct an instance of the UIData.
-   */
-  public UIData()
-  {
-    setRendererType("javax.faces.Table");
-  }
+package javax.faces.component;
+
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.util.*;
+import javax.el.ValueExpression;
+import javax.faces.FacesException;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+import javax.faces.event.PhaseId;
+import javax.faces.model.*;
+import javax.servlet.jsp.jstl.sql.Result;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ *
+ * UIData is a base abstraction for components that holds Data.
+ */
+@JSFComponent
+(defaultRendererType = "javax.faces.Table"
+)
+public class UIData extends UIComponentBase
+                    implements NamingContainer
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Data";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Data";
+
+  /**
+   * Construct an instance of the UIData.
+   */
+  public UIData()
+  {
+    setRendererType("javax.faces.Table");
+  }
       private static final String FOOTER_FACET_NAME = "footer";
     private static final String HEADER_FACET_NAME = "header";
     private static final Class OBJECT_ARRAY_CLASS = (new Object[0]).getClass();
@@ -959,139 +959,139 @@
             evh.setSubmittedValue(_submittedValue);
         }
     }
-
-  // Property: value
-  private Object _value;
-
-  /**
-   * Gets An EL expression that specifies the data model that backs this table.  The value can be of any type.
-   * 
-   *                 A value of type DataModel is used directly.  Array-like parameters of type java.util.List, array of Object,
-   *                 java.sql.ResultSet, or javax.servlet.jsp.jstl.sql.Result are wrapped in a DataModel.
-   * 
-   *                 Other values are wrapped in a DataModel as a single row.
-   *
-   * @return  the new value value
-   */
-  @JSFProperty
-  public Object getValue()
-  {
-    if (_value != null)
-    {
-      return _value;
-    }
-    ValueExpression expression = getValueExpression("value");
-    if (expression != null)
-    {
-      return expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  // Property: var
-  private String _var;
-
-  /**
-   * Gets Defines the name of the request-scope variable that will hold the current row during iteration.  This value must be a static value.
-   *
-   * @return  the new var value
-   */
-  @JSFProperty
-  (literalOnly = true)
-  public String getVar()
-  {
-    return _var;
-  }
-
-  /**
-   * Sets Defines the name of the request-scope variable that will hold the current row during iteration.  This value must be a static value.
-   * 
-   * @param var  the new var value
-   */
-  public void setVar(String var)
-  {
-    this._var = var;
-  }
-
-  // Property: rows
-  private int _rows;
-  private boolean _rowsSet;
-
-  /**
-   * Gets The number of rows to be displayed.  Specify zero for all remaining rows in the table.
-   *
-   * @return  the new rows value
-   */
-  @JSFProperty
-  public int getRows()
-  {
-    if (_rowsSet)
-    {
-      return _rows;
-    }
-    ValueExpression expression = getValueExpression("rows");
-    if (expression != null)
-    {
-      return (Integer)expression.getValue(getFacesContext().getELContext());
-    }
-    return 0;
-  }
-
-  // Property: first
-  private int _first;
-  private boolean _firstSet;
-
-  /**
-   * Gets The index of the first row to be displayed, where 0 is the first row.
-   *
-   * @return  the new first value
-   */
-  @JSFProperty
-  public int getFirst()
-  {
-    if (_firstSet)
-    {
-      return _first;
-    }
-    ValueExpression expression = getValueExpression("first");
-    if (expression != null)
-    {
-      return (Integer)expression.getValue(getFacesContext().getELContext());
-    }
-    return 0;
-  }
-
-  @Override
-  public Object saveState(FacesContext facesContext)
-  {
-    Object[] values = new Object[7];
-    values[0] = super.saveState(facesContext);
-    values[1] = _value;
-    values[2] = _var;
-    values[3] = _rows;
-    values[4] = _rowsSet;
-    values[5] = _first;
-    values[6] = _firstSet;
-
-    return values;
-  }
-
-  @Override
-  public void restoreState(FacesContext facesContext, Object state)
-  {
-    Object[] values = (Object[])state;
-    super.restoreState(facesContext,values[0]);
-    _value = values[1];
-    _var = (String)values[2];
-    _rows = (Integer)values[3];
-    _rowsSet = (Boolean)values[4];
-    _first = (Integer)values[5];
-    _firstSet = (Boolean)values[6];
-  }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+
+  // Property: value
+  private Object _value;
+
+  /**
+   * Gets An EL expression that specifies the data model that backs this table.  The value can be of any type.
+   * 
+   *                 A value of type DataModel is used directly.  Array-like parameters of type java.util.List, array of Object,
+   *                 java.sql.ResultSet, or javax.servlet.jsp.jstl.sql.Result are wrapped in a DataModel.
+   * 
+   *                 Other values are wrapped in a DataModel as a single row.
+   *
+   * @return  the new value value
+   */
+  @JSFProperty
+  public Object getValue()
+  {
+    if (_value != null)
+    {
+      return _value;
+    }
+    ValueExpression expression = getValueExpression("value");
+    if (expression != null)
+    {
+      return expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  // Property: var
+  private String _var;
+
+  /**
+   * Gets Defines the name of the request-scope variable that will hold the current row during iteration.  This value must be a static value.
+   *
+   * @return  the new var value
+   */
+  @JSFProperty
+  (literalOnly = true)
+  public String getVar()
+  {
+    return _var;
+  }
+
+  /**
+   * Sets Defines the name of the request-scope variable that will hold the current row during iteration.  This value must be a static value.
+   * 
+   * @param var  the new var value
+   */
+  public void setVar(String var)
+  {
+    this._var = var;
+  }
+
+  // Property: rows
+  private int _rows;
+  private boolean _rowsSet;
+
+  /**
+   * Gets The number of rows to be displayed.  Specify zero for all remaining rows in the table.
+   *
+   * @return  the new rows value
+   */
+  @JSFProperty
+  public int getRows()
+  {
+    if (_rowsSet)
+    {
+      return _rows;
+    }
+    ValueExpression expression = getValueExpression("rows");
+    if (expression != null)
+    {
+      return (Integer)expression.getValue(getFacesContext().getELContext());
+    }
+    return 0;
+  }
+
+  // Property: first
+  private int _first;
+  private boolean _firstSet;
+
+  /**
+   * Gets The index of the first row to be displayed, where 0 is the first row.
+   *
+   * @return  the new first value
+   */
+  @JSFProperty
+  public int getFirst()
+  {
+    if (_firstSet)
+    {
+      return _first;
+    }
+    ValueExpression expression = getValueExpression("first");
+    if (expression != null)
+    {
+      return (Integer)expression.getValue(getFacesContext().getELContext());
+    }
+    return 0;
+  }
+
+  @Override
+  public Object saveState(FacesContext facesContext)
+  {
+    Object[] values = new Object[7];
+    values[0] = super.saveState(facesContext);
+    values[1] = _value;
+    values[2] = _var;
+    values[3] = _rows;
+    values[4] = _rowsSet;
+    values[5] = _first;
+    values[6] = _firstSet;
+
+    return values;
+  }
+
+  @Override
+  public void restoreState(FacesContext facesContext, Object state)
+  {
+    Object[] values = (Object[])state;
+    super.restoreState(facesContext,values[0]);
+    _value = values[1];
+    _var = (String)values[2];
+    _rows = (Integer)values[3];
+    _rowsSet = (Boolean)values[4];
+    _first = (Integer)values[5];
+    _firstSet = (Boolean)values[6];
+  }
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIGraphic.java Thu Jul  3 15:15:26 2008
@@ -19,36 +19,36 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * Displays a graphical image.
- */
-@JSFComponent
-(defaultRendererType = "javax.faces.Image"
-)
-public class UIGraphic extends UIComponentBase
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Graphic";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Graphic";
-
-  /**
-   * Construct an instance of the UIGraphic.
-   */
-  public UIGraphic()
-  {
-    setRendererType("javax.faces.Image");
-  }
+package javax.faces.component;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ *
+ * Displays a graphical image.
+ */
+@JSFComponent
+(defaultRendererType = "javax.faces.Image"
+)
+public class UIGraphic extends UIComponentBase
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Graphic";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Graphic";
+
+  /**
+   * Construct an instance of the UIGraphic.
+   */
+  public UIGraphic()
+  {
+    setRendererType("javax.faces.Image");
+  }
       private static final String URL_PROPERTY = "url";
     private static final String VALUE_PROPERTY = "value";
     
@@ -90,66 +90,66 @@
             super.setValueExpression(name, binding);
         }
     }
-
-  // Property: value
-  private Object _value;
-
-  /**
-   * Gets The value property of the UIGraphic
-   *
-   * @return  the new value value
-   */
-  @JSFProperty
-  public Object getValue()
-  {
-    if (_value != null)
-    {
-      return _value;
-    }
-    ValueExpression expression = getValueExpression("value");
-    if (expression != null)
-    {
-      return expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets The value property of the UIGraphic
-   * 
-   * @param value  the new value value
-   */
-  public void setValue(Object value)
-  {
-    this._value = value;
-  }
-
-  // Property: url
-  private String _url;
-
-  @Override
-  public Object saveState(FacesContext facesContext)
-  {
-    Object[] values = new Object[3];
-    values[0] = super.saveState(facesContext);
-    values[1] = _value;
-    values[2] = _url;
-
-    return values;
-  }
-
-  @Override
-  public void restoreState(FacesContext facesContext, Object state)
-  {
-    Object[] values = (Object[])state;
-    super.restoreState(facesContext,values[0]);
-    _value = values[1];
-    _url = (String)values[2];
-  }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+
+  // Property: value
+  private Object _value;
+
+  /**
+   * Gets The value property of the UIGraphic
+   *
+   * @return  the new value value
+   */
+  @JSFProperty
+  public Object getValue()
+  {
+    if (_value != null)
+    {
+      return _value;
+    }
+    ValueExpression expression = getValueExpression("value");
+    if (expression != null)
+    {
+      return expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets The value property of the UIGraphic
+   * 
+   * @param value  the new value value
+   */
+  public void setValue(Object value)
+  {
+    this._value = value;
+  }
+
+  // Property: url
+  private String _url;
+
+  @Override
+  public Object saveState(FacesContext facesContext)
+  {
+    Object[] values = new Object[3];
+    values[0] = super.saveState(facesContext);
+    values[1] = _value;
+    values[2] = _url;
+
+    return values;
+  }
+
+  @Override
+  public void restoreState(FacesContext facesContext, Object state)
+  {
+    Object[] values = (Object[])state;
+    super.restoreState(facesContext,values[0]);
+    _value = values[1];
+    _url = (String)values[2];
+  }
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UINamingContainer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UINamingContainer.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UINamingContainer.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UINamingContainer.java Thu Jul  3 15:15:26 2008
@@ -19,36 +19,36 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- */
-@JSFComponent
-public class UINamingContainer extends UIComponentBase
-                               implements NamingContainer
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.NamingContainer";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.NamingContainer";
-
-  /**
-   * Construct an instance of the UINamingContainer.
-   */
-  public UINamingContainer()
-  {
-    setRendererType(null);
-  }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+package javax.faces.component;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ */
+@JSFComponent
+public class UINamingContainer extends UIComponentBase
+                               implements NamingContainer
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.NamingContainer";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.NamingContainer";
+
+  /**
+   * Construct an instance of the UINamingContainer.
+   */
+  public UINamingContainer()
+  {
+    setRendererType(null);
+  }
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIOutput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIOutput.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIOutput.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIOutput.java Thu Jul  3 15:15:26 2008
@@ -19,141 +19,141 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UIOutput displays a value to the user
- */
-@JSFComponent
-(defaultRendererType = "javax.faces.Text"
-)
-public class UIOutput extends UIComponentBase
-                      implements ValueHolder
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Output";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Output";
-
-  /**
-   * Construct an instance of the UIOutput.
-   */
-  public UIOutput()
-  {
-    setRendererType("javax.faces.Text");
-  }
+package javax.faces.component;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ *
+ * UIOutput displays a value to the user
+ */
+@JSFComponent
+(defaultRendererType = "javax.faces.Text"
+)
+public class UIOutput extends UIComponentBase
+                      implements ValueHolder
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Output";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Output";
+
+  /**
+   * Construct an instance of the UIOutput.
+   */
+  public UIOutput()
+  {
+    setRendererType("javax.faces.Text");
+  }
       public Object getLocalValue()
     {
         return _value;
     }
-
-  // Property: value
-  private Object _value;
-
-  /**
-   * Gets The initial value of this component.
-   *
-   * @return  the new value value
-   */
-  @JSFProperty
-  public Object getValue()
-  {
-    if (_value != null)
-    {
-      return _value;
-    }
-    ValueExpression expression = getValueExpression("value");
-    if (expression != null)
-    {
-      return expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets The initial value of this component.
-   * 
-   * @param value  the new value value
-   */
-  public void setValue(Object value)
-  {
-    this._value = value;
-  }
-
-  // Property: converter
-  private Converter _converter;
-
-  /**
-   * Gets An expression that specifies the Converter for this component.
-   *               The value can either be a static value (ID) or an EL expression.
-   *               When a static id is specified, an instance of the converter type
-   *               registered with that id is used. When this is an EL expression,
-   *               the result of evaluating the expression must be an object that
-   *               implements the Converter interface.
-   *
-   * @return  the new converter value
-   */
-  @JSFProperty
-  public Converter getConverter()
-  {
-    if (_converter != null)
-    {
-      return _converter;
-    }
-    ValueExpression expression = getValueExpression("converter");
-    if (expression != null)
-    {
-      return (Converter)expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets An expression that specifies the Converter for this component.
-   *               The value can either be a static value (ID) or an EL expression.
-   *               When a static id is specified, an instance of the converter type
-   *               registered with that id is used. When this is an EL expression,
-   *               the result of evaluating the expression must be an object that
-   *               implements the Converter interface.
-   * 
-   * @param converter  the new converter value
-   */
-  public void setConverter(Converter converter)
-  {
-    this._converter = converter;
-  }
-
-  @Override
-  public Object saveState(FacesContext facesContext)
-  {
-    Object[] values = new Object[3];
-    values[0] = super.saveState(facesContext);
-    values[1] = _value;
-    values[2] = saveAttachedState(facesContext, _converter);
-
-    return values;
-  }
-
-  @Override
-  public void restoreState(FacesContext facesContext, Object state)
-  {
-    Object[] values = (Object[])state;
-    super.restoreState(facesContext,values[0]);
-    _value = values[1];
-    _converter = (Converter) restoreAttachedState(facesContext, values[2]);
-  }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+
+  // Property: value
+  private Object _value;
+
+  /**
+   * Gets The initial value of this component.
+   *
+   * @return  the new value value
+   */
+  @JSFProperty
+  public Object getValue()
+  {
+    if (_value != null)
+    {
+      return _value;
+    }
+    ValueExpression expression = getValueExpression("value");
+    if (expression != null)
+    {
+      return expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets The initial value of this component.
+   * 
+   * @param value  the new value value
+   */
+  public void setValue(Object value)
+  {
+    this._value = value;
+  }
+
+  // Property: converter
+  private Converter _converter;
+
+  /**
+   * Gets An expression that specifies the Converter for this component.
+   *               The value can either be a static value (ID) or an EL expression.
+   *               When a static id is specified, an instance of the converter type
+   *               registered with that id is used. When this is an EL expression,
+   *               the result of evaluating the expression must be an object that
+   *               implements the Converter interface.
+   *
+   * @return  the new converter value
+   */
+  @JSFProperty
+  public Converter getConverter()
+  {
+    if (_converter != null)
+    {
+      return _converter;
+    }
+    ValueExpression expression = getValueExpression("converter");
+    if (expression != null)
+    {
+      return (Converter)expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets An expression that specifies the Converter for this component.
+   *               The value can either be a static value (ID) or an EL expression.
+   *               When a static id is specified, an instance of the converter type
+   *               registered with that id is used. When this is an EL expression,
+   *               the result of evaluating the expression must be an object that
+   *               implements the Converter interface.
+   * 
+   * @param converter  the new converter value
+   */
+  public void setConverter(Converter converter)
+  {
+    this._converter = converter;
+  }
+
+  @Override
+  public Object saveState(FacesContext facesContext)
+  {
+    Object[] values = new Object[3];
+    values[0] = super.saveState(facesContext);
+    values[1] = _value;
+    values[2] = saveAttachedState(facesContext, _converter);
+
+    return values;
+  }
+
+  @Override
+  public void restoreState(FacesContext facesContext, Object state)
+  {
+    Object[] values = (Object[])state;
+    super.restoreState(facesContext,values[0]);
+    _value = values[1];
+    _converter = (Converter) restoreAttachedState(facesContext, values[2]);
+  }
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIPanel.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIPanel.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIPanel.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIPanel.java Thu Jul  3 15:15:26 2008
@@ -19,35 +19,35 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- */
-@JSFComponent
-public class UIPanel extends UIComponentBase
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Panel";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Panel";
-
-  /**
-   * Construct an instance of the UIPanel.
-   */
-  public UIPanel()
-  {
-    setRendererType(null);
-  }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+package javax.faces.component;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ */
+@JSFComponent
+public class UIPanel extends UIComponentBase
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Panel";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Panel";
+
+  /**
+   * Construct an instance of the UIPanel.
+   */
+  public UIPanel()
+  {
+    setRendererType(null);
+  }
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectBoolean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectBoolean.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectBoolean.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectBoolean.java Thu Jul  3 15:15:26 2008
@@ -19,51 +19,51 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UISelectBoolean is a Comonent which represents a boolean value.
- *
- * <h4>Events:</h4>
- * <table border="1" width="100%" cellpadding="3" summary="">
- * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
- * <th align="left">Type</th>
- * <th align="left">Phases</th>
- * <th align="left">Description</th>
- * </tr>
- * <tr class="TableRowColor">
- * <td valign="top"><code>javax.faces.event.ValueChangeEvent</code></td>
- * <td valign="top" nowrap></td>
- * <td valign="top">The valueChange event is delivered when the value
-                attribute is changed.</td>
- * </tr>
- * </table>
- */
-@JSFComponent
-(defaultRendererType = "javax.faces.Checkbox"
-)
-public class UISelectBoolean extends UIInput
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.SelectBoolean";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.SelectBoolean";
-
-  /**
-   * Construct an instance of the UISelectBoolean.
-   */
-  public UISelectBoolean()
-  {
-    setRendererType("javax.faces.Checkbox");
-  }
+package javax.faces.component;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ *
+ * UISelectBoolean is a Comonent which represents a boolean value.
+ *
+ * <h4>Events:</h4>
+ * <table border="1" width="100%" cellpadding="3" summary="">
+ * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+ * <th align="left">Type</th>
+ * <th align="left">Phases</th>
+ * <th align="left">Description</th>
+ * </tr>
+ * <tr class="TableRowColor">
+ * <td valign="top"><code>javax.faces.event.ValueChangeEvent</code></td>
+ * <td valign="top" nowrap></td>
+ * <td valign="top">The valueChange event is delivered when the value
+                attribute is changed.</td>
+ * </tr>
+ * </table>
+ */
+@JSFComponent
+(defaultRendererType = "javax.faces.Checkbox"
+)
+public class UISelectBoolean extends UIInput
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.SelectBoolean";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.SelectBoolean";
+
+  /**
+   * Construct an instance of the UISelectBoolean.
+   */
+  public UISelectBoolean()
+  {
+    setRendererType("javax.faces.Checkbox");
+  }
   
     public void setSelected(boolean selected)
     {
@@ -138,10 +138,10 @@
             super.setValueExpression(name, binding);
         }
     }    
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectMany.java Thu Jul  3 15:15:26 2008
@@ -19,61 +19,61 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import javax.el.ValueExpression;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
-import javax.faces.render.Renderer;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UISelectMany is a Component which represents a user choice of 0..n values.
- *
- * <h4>Events:</h4>
- * <table border="1" width="100%" cellpadding="3" summary="">
- * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
- * <th align="left">Type</th>
- * <th align="left">Phases</th>
- * <th align="left">Description</th>
- * </tr>
- * <tr class="TableRowColor">
- * <td valign="top"><code>javax.faces.event.ValueChangeEvent</code></td>
- * <td valign="top" nowrap></td>
- * <td valign="top">The valueChange event is delivered when the value
-                attribute is changed.</td>
- * </tr>
- * </table>
- */
-@JSFComponent
-(defaultRendererType = "javax.faces.Listbox"
-)
-public class UISelectMany extends UIInput
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.SelectMany";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.SelectMany";
-
-  /**
-   * Construct an instance of the UISelectMany.
-   */
-  public UISelectMany()
-  {
-    setRendererType("javax.faces.Listbox");
-  }
+package javax.faces.component;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import javax.el.ValueExpression;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.ConverterException;
+import javax.faces.el.ValueBinding;
+import javax.faces.render.Renderer;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ *
+ * UISelectMany is a Component which represents a user choice of 0..n values.
+ *
+ * <h4>Events:</h4>
+ * <table border="1" width="100%" cellpadding="3" summary="">
+ * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+ * <th align="left">Type</th>
+ * <th align="left">Phases</th>
+ * <th align="left">Description</th>
+ * </tr>
+ * <tr class="TableRowColor">
+ * <td valign="top"><code>javax.faces.event.ValueChangeEvent</code></td>
+ * <td valign="top" nowrap></td>
+ * <td valign="top">The valueChange event is delivered when the value
+                attribute is changed.</td>
+ * </tr>
+ * </table>
+ */
+@JSFComponent
+(defaultRendererType = "javax.faces.Listbox"
+)
+public class UISelectMany extends UIInput
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.SelectMany";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.SelectMany";
+
+  /**
+   * Construct an instance of the UISelectMany.
+   */
+  public UISelectMany()
+  {
+    setRendererType("javax.faces.Listbox");
+  }
       public static final String INVALID_MESSAGE_ID = "javax.faces.component.UISelectMany.INVALID";
 
 
@@ -441,10 +441,10 @@
             }
         }
     }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectOne.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectOne.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectOne.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UISelectOne.java Thu Jul  3 15:15:26 2008
@@ -19,50 +19,50 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UISelectOne is a Component which represents a user choice of 0..1 value.
- *
- * <h4>Events:</h4>
- * <table border="1" width="100%" cellpadding="3" summary="">
- * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
- * <th align="left">Type</th>
- * <th align="left">Phases</th>
- * <th align="left">Description</th>
- * </tr>
- * <tr class="TableRowColor">
- * <td valign="top"><code>javax.faces.event.ValueChangeEvent</code></td>
- * <td valign="top" nowrap></td>
- * <td valign="top">The valueChange event is delivered when the value
-                attribute is changed.</td>
- * </tr>
- * </table>
- */
-@JSFComponent
-(defaultRendererType = "javax.faces.Menu"
-)
-public class UISelectOne extends UIInput
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.SelectOne";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.SelectOne";
-
-  /**
-   * Construct an instance of the UISelectOne.
-   */
-  public UISelectOne()
-  {
-    setRendererType("javax.faces.Menu");
-  }
+package javax.faces.component;
+
+import javax.el.ValueExpression;
+import javax.faces.context.FacesContext;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ *
+ * UISelectOne is a Component which represents a user choice of 0..1 value.
+ *
+ * <h4>Events:</h4>
+ * <table border="1" width="100%" cellpadding="3" summary="">
+ * <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+ * <th align="left">Type</th>
+ * <th align="left">Phases</th>
+ * <th align="left">Description</th>
+ * </tr>
+ * <tr class="TableRowColor">
+ * <td valign="top"><code>javax.faces.event.ValueChangeEvent</code></td>
+ * <td valign="top" nowrap></td>
+ * <td valign="top">The valueChange event is delivered when the value
+                attribute is changed.</td>
+ * </tr>
+ * </table>
+ */
+@JSFComponent
+(defaultRendererType = "javax.faces.Menu"
+)
+public class UISelectOne extends UIInput
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.SelectOne";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.SelectOne";
+
+  /**
+   * Construct an instance of the UISelectOne.
+   */
+  public UISelectOne()
+  {
+    setRendererType("javax.faces.Menu");
+  }
       public static final String INVALID_MESSAGE_ID = "javax.faces.component.UISelectOne.INVALID";
 
     /**
@@ -96,10 +96,10 @@
             setValid(false);
         }
     }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/UIViewRoot.java Thu Jul  3 15:15:26 2008
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
+package javax.faces.component;
+
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
 import java.util.List;
@@ -43,28 +43,28 @@
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * The root element.
- */
+
+/**
+ *
+ * The root element.
+ */
 @JSFComponent
 @JSFJspProperty(name = "binding",returnType = "java.lang.String",tagExcluded = true)
-public class UIViewRoot extends UIComponentBase
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.ViewRoot";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.ViewRoot";
-
-  /**
-   * Construct an instance of the UIViewRoot.
-   */
-  public UIViewRoot()
-  {
-    setRendererType(null);
-  }
+public class UIViewRoot extends UIComponentBase
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.ViewRoot";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.ViewRoot";
+
+  /**
+   * Construct an instance of the UIViewRoot.
+   */
+  public UIViewRoot()
+  {
+    setRendererType(null);
+  }
       private static final int ANY_PHASE_ORDINAL = PhaseId.ANY_PHASE.getOrdinal();
     public static final String UNIQUE_ID_PREFIX = "j_id";
 
@@ -377,53 +377,53 @@
         return Locale.getDefault();
     }
 
-
-  // Property: locale
-  private Locale _locale;
-
-  /**
-   * Sets The locale for this ViewRoot.
-   * 
-   * @param locale  the new locale value
-   */
-  public void setLocale(Locale locale)
-  {
-    this._locale = locale;
-  }
-
-  // Property: renderKitId
-  private String _renderKitId;
-
-  /**
-   * Gets The initial value of this component.
-   *
-   * @return  the new renderKitId value
-   */
-  @JSFProperty
-  public String getRenderKitId()
-  {
-    if (_renderKitId != null)
-    {
-      return _renderKitId;
-    }
-    ValueExpression expression = getValueExpression("renderKitId");
-    if (expression != null)
-    {
-      return (String)expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets The initial value of this component.
-   * 
-   * @param renderKitId  the new renderKitId value
-   */
-  public void setRenderKitId(String renderKitId)
-  {
-    this._renderKitId = renderKitId;
-  }
-
+
+  // Property: locale
+  private Locale _locale;
+
+  /**
+   * Sets The locale for this ViewRoot.
+   * 
+   * @param locale  the new locale value
+   */
+  public void setLocale(Locale locale)
+  {
+    this._locale = locale;
+  }
+
+  // Property: renderKitId
+  private String _renderKitId;
+
+  /**
+   * Gets The initial value of this component.
+   *
+   * @return  the new renderKitId value
+   */
+  @JSFProperty
+  public String getRenderKitId()
+  {
+    if (_renderKitId != null)
+    {
+      return _renderKitId;
+    }
+    ValueExpression expression = getValueExpression("renderKitId");
+    if (expression != null)
+    {
+      return (String)expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets The initial value of this component.
+   * 
+   * @param renderKitId  the new renderKitId value
+   */
+  public void setRenderKitId(String renderKitId)
+  {
+    this._renderKitId = renderKitId;
+  }
+
   /**
    * Disable this property; although this class extends a base-class that
    * defines a read/write rendered property, this particular subclass
@@ -480,172 +480,172 @@
       return null;
   }
 
-  // Property: viewId
-  private String _viewId;
-
-  /**
-   * Gets The viewId.
-   *
-   * @return  the new viewId value
-   */
-  @JSFProperty
-  (tagExcluded = true)
-  public String getViewId()
-  {
-    return _viewId;
-  }
-
-  /**
-   * Sets The viewId.
-   * 
-   * @param viewId  the new viewId value
-   */
-  public void setViewId(String viewId)
-  {
-    this._viewId = viewId;
-  }
-
-  // Property: events
-  private List<FacesEvent> _events;
-
-  // Property: uniqueIdCounter
-  private long _uniqueIdCounter = 0;
-
-  // Property: phaseListeners
-  private List<PhaseListener> _phaseListeners;
-
-  /**
-   * Adds a The phaseListeners attached to ViewRoot.
-   */
-  public void addPhaseListener( PhaseListener phaseListener)
-  {
-    if (phaseListener == null) throw new NullPointerException("phaseListener");
-    if (_phaseListeners == null)
-      _phaseListeners = new ArrayList<PhaseListener>();
-
-    _phaseListeners.add(phaseListener);
-  }
-
-  /**
-   * Removes a The phaseListeners attached to ViewRoot.
-   */
-  public void removePhaseListener( PhaseListener phaseListener)
-  {
-    if (phaseListener == null || _phaseListeners == null)
-      return;
-
-    _phaseListeners.remove(phaseListener);
-  }
-
-  // Property: beforePhaseListener
-  private MethodExpression _beforePhaseListener;
-
-  /**
-   * Gets 
-   *
-   * @return  the new beforePhaseListener value
-   */
-  @JSFProperty
-  (stateHolder = true,
-  returnSignature = "void",
-  methodSignature = "javax.faces.event.PhaseEvent",
-  jspName = "beforePhase")
-  public MethodExpression getBeforePhaseListener()
-  {
-    if (_beforePhaseListener != null)
-    {
-      return _beforePhaseListener;
-    }
-    ValueExpression expression = getValueExpression("beforePhaseListener");
-    if (expression != null)
-    {
-      return (MethodExpression)expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets 
-   * 
-   * @param beforePhaseListener  the new beforePhaseListener value
-   */
-  public void setBeforePhaseListener(MethodExpression beforePhaseListener)
-  {
-    this._beforePhaseListener = beforePhaseListener;
-  }
-
-  // Property: afterPhaseListener
-  private MethodExpression _afterPhaseListener;
-
-  /**
-   * Gets 
-   *
-   * @return  the new afterPhaseListener value
-   */
-  @JSFProperty
-  (stateHolder = true,
-  returnSignature = "void",
-  methodSignature = "javax.faces.event.PhaseEvent",
-  jspName = "afterPhase")
-  public MethodExpression getAfterPhaseListener()
-  {
-    if (_afterPhaseListener != null)
-    {
-      return _afterPhaseListener;
-    }
-    ValueExpression expression = getValueExpression("afterPhaseListener");
-    if (expression != null)
-    {
-      return (MethodExpression)expression.getValue(getFacesContext().getELContext());
-    }
-    return null;
-  }
-
-  /**
-   * Sets 
-   * 
-   * @param afterPhaseListener  the new afterPhaseListener value
-   */
-  public void setAfterPhaseListener(MethodExpression afterPhaseListener)
-  {
-    this._afterPhaseListener = afterPhaseListener;
-  }
-
-  @Override
-  public Object saveState(FacesContext facesContext)
-  {
-    Object[] values = new Object[10];
-    values[0] = super.saveState(facesContext);
-    values[1] = _locale;
-    values[2] = _renderKitId;
-    values[3] = _viewId;
-    values[4] = saveAttachedState(facesContext, _events);
-    values[5] = _uniqueIdCounter;
-    values[7] = saveAttachedState(facesContext, _phaseListeners);
-    values[8] = saveAttachedState(facesContext, _beforePhaseListener);
-    values[9] = saveAttachedState(facesContext, _afterPhaseListener);
-
-    return values;
-  }
-
-  @Override
-  public void restoreState(FacesContext facesContext, Object state)
-  {
-    Object[] values = (Object[])state;
-    super.restoreState(facesContext,values[0]);
-    _locale = (Locale)values[1];
-    _renderKitId = (String)values[2];
-    _viewId = (String)values[3];
-    _events = (List)restoreAttachedState(facesContext, values[4]);
-    _uniqueIdCounter = (Long)values[5];
-    _phaseListeners = (List) restoreAttachedState(facesContext, values[7]);
-    _beforePhaseListener = (MethodExpression)restoreAttachedState(facesContext, values[8]);
-    _afterPhaseListener = (MethodExpression)restoreAttachedState(facesContext, values[9]);
-  }
-
-  @Override
-  public String getFamily()
-  {
-    return COMPONENT_FAMILY;
-  }
-}
+  // Property: viewId
+  private String _viewId;
+
+  /**
+   * Gets The viewId.
+   *
+   * @return  the new viewId value
+   */
+  @JSFProperty
+  (tagExcluded = true)
+  public String getViewId()
+  {
+    return _viewId;
+  }
+
+  /**
+   * Sets The viewId.
+   * 
+   * @param viewId  the new viewId value
+   */
+  public void setViewId(String viewId)
+  {
+    this._viewId = viewId;
+  }
+
+  // Property: events
+  private List<FacesEvent> _events;
+
+  // Property: uniqueIdCounter
+  private long _uniqueIdCounter = 0;
+
+  // Property: phaseListeners
+  private List<PhaseListener> _phaseListeners;
+
+  /**
+   * Adds a The phaseListeners attached to ViewRoot.
+   */
+  public void addPhaseListener( PhaseListener phaseListener)
+  {
+    if (phaseListener == null) throw new NullPointerException("phaseListener");
+    if (_phaseListeners == null)
+      _phaseListeners = new ArrayList<PhaseListener>();
+
+    _phaseListeners.add(phaseListener);
+  }
+
+  /**
+   * Removes a The phaseListeners attached to ViewRoot.
+   */
+  public void removePhaseListener( PhaseListener phaseListener)
+  {
+    if (phaseListener == null || _phaseListeners == null)
+      return;
+
+    _phaseListeners.remove(phaseListener);
+  }
+
+  // Property: beforePhaseListener
+  private MethodExpression _beforePhaseListener;
+
+  /**
+   * Gets 
+   *
+   * @return  the new beforePhaseListener value
+   */
+  @JSFProperty
+  (stateHolder = true,
+  returnSignature = "void",
+  methodSignature = "javax.faces.event.PhaseEvent",
+  jspName = "beforePhase")
+  public MethodExpression getBeforePhaseListener()
+  {
+    if (_beforePhaseListener != null)
+    {
+      return _beforePhaseListener;
+    }
+    ValueExpression expression = getValueExpression("beforePhaseListener");
+    if (expression != null)
+    {
+      return (MethodExpression)expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets 
+   * 
+   * @param beforePhaseListener  the new beforePhaseListener value
+   */
+  public void setBeforePhaseListener(MethodExpression beforePhaseListener)
+  {
+    this._beforePhaseListener = beforePhaseListener;
+  }
+
+  // Property: afterPhaseListener
+  private MethodExpression _afterPhaseListener;
+
+  /**
+   * Gets 
+   *
+   * @return  the new afterPhaseListener value
+   */
+  @JSFProperty
+  (stateHolder = true,
+  returnSignature = "void",
+  methodSignature = "javax.faces.event.PhaseEvent",
+  jspName = "afterPhase")
+  public MethodExpression getAfterPhaseListener()
+  {
+    if (_afterPhaseListener != null)
+    {
+      return _afterPhaseListener;
+    }
+    ValueExpression expression = getValueExpression("afterPhaseListener");
+    if (expression != null)
+    {
+      return (MethodExpression)expression.getValue(getFacesContext().getELContext());
+    }
+    return null;
+  }
+
+  /**
+   * Sets 
+   * 
+   * @param afterPhaseListener  the new afterPhaseListener value
+   */
+  public void setAfterPhaseListener(MethodExpression afterPhaseListener)
+  {
+    this._afterPhaseListener = afterPhaseListener;
+  }
+
+  @Override
+  public Object saveState(FacesContext facesContext)
+  {
+    Object[] values = new Object[10];
+    values[0] = super.saveState(facesContext);
+    values[1] = _locale;
+    values[2] = _renderKitId;
+    values[3] = _viewId;
+    values[4] = saveAttachedState(facesContext, _events);
+    values[5] = _uniqueIdCounter;
+    values[7] = saveAttachedState(facesContext, _phaseListeners);
+    values[8] = saveAttachedState(facesContext, _beforePhaseListener);
+    values[9] = saveAttachedState(facesContext, _afterPhaseListener);
+
+    return values;
+  }
+
+  @Override
+  public void restoreState(FacesContext facesContext, Object state)
+  {
+    Object[] values = (Object[])state;
+    super.restoreState(facesContext,values[0]);
+    _locale = (Locale)values[1];
+    _renderKitId = (String)values[2];
+    _viewId = (String)values[3];
+    _events = (List)restoreAttachedState(facesContext, values[4]);
+    _uniqueIdCounter = (Long)values[5];
+    _phaseListeners = (List) restoreAttachedState(facesContext, values[7]);
+    _beforePhaseListener = (MethodExpression)restoreAttachedState(facesContext, values[8]);
+    _afterPhaseListener = (MethodExpression)restoreAttachedState(facesContext, values[9]);
+  }
+
+  @Override
+  public String getFamily()
+  {
+    return COMPONENT_FAMILY;
+  }
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessage.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessage.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessage.java Thu Jul  3 15:15:26 2008
@@ -16,59 +16,59 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
+package javax.faces.component;
+
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UIMessage is the base component class for components
- * that display a single message on behalf of a component.
- */
-@JSFComponent
+
+/**
+ *
+ * UIMessage is the base component class for components
+ * that display a single message on behalf of a component.
+ */
+@JSFComponent
 (clazz = "javax.faces.component.UIMessage",template=true,
-defaultRendererType = "javax.faces.Message"
-)
-abstract class _UIMessage extends UIComponentBase
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Message";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Message";
-
-  /**
+defaultRendererType = "javax.faces.Message"
+)
+abstract class _UIMessage extends UIComponentBase
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Message";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Message";
+
+  /**
    * The ID of the component whose attached FacesMessage object (if present) 
-   * should be diplayed by this component.
-   * <p>
-   * This is a required property on the component.
-   * </p>
-   *
-   * @return  the new for value
-   */
-  @JSFProperty
-  (required = true)
-  public abstract String getFor();
-
-  /**
+   * should be diplayed by this component.
+   * <p>
+   * This is a required property on the component.
+   * </p>
+   *
+   * @return  the new for value
+   */
+  @JSFProperty
+  (required = true)
+  public abstract String getFor();
+
+  /**
    * Specifies whether the detailed information from the message should be shown. 
-   * Default to false.
-   *
-   * @return  the new showDetail value
-   */
-  @JSFProperty
-  (defaultValue = "true")
-  public abstract boolean isShowDetail();
-
-  /**
+   * Default to false.
+   *
+   * @return  the new showDetail value
+   */
+  @JSFProperty
+  (defaultValue = "true")
+  public abstract boolean isShowDetail();
+
+  /**
    * Specifies whether the summary information from the message should be shown.
-   * Defaults to true.
-   *
-   * @return  the new showSummary value
-   */
-  @JSFProperty
-  (defaultValue = "false")
-  public abstract boolean isShowSummary();
-
-}
+   * Defaults to true.
+   *
+   * @return  the new showSummary value
+   */
+  @JSFProperty
+  (defaultValue = "false")
+  public abstract boolean isShowSummary();
+
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessages.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessages.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessages.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIMessages.java Thu Jul  3 15:15:26 2008
@@ -16,38 +16,38 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
+package javax.faces.component;
+
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UIMessage is the base component class for components
- * that display a multiple messages on behalf of a component.
- */
-@JSFComponent
+
+/**
+ *
+ * UIMessage is the base component class for components
+ * that display a multiple messages on behalf of a component.
+ */
+@JSFComponent
 (clazz = "javax.faces.component.UIMessages",template=true,
-defaultRendererType = "javax.faces.Messages"
-)
-abstract class _UIMessages extends UIComponentBase
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Messages";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Messages";
-
-  /**
-   * Specifies whether only messages (FacesMessage objects) not associated with a
-   * specific component should be displayed, ie whether messages should be ignored
-   * if they are attached to a particular component. Defaults to false.
-   *
-   * @return  the new globalOnly value
-   */
-  @JSFProperty
-  (defaultValue = "false")
-  public abstract boolean isGlobalOnly();
+defaultRendererType = "javax.faces.Messages"
+)
+abstract class _UIMessages extends UIComponentBase
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Messages";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Messages";
+
+  /**
+   * Specifies whether only messages (FacesMessage objects) not associated with a
+   * specific component should be displayed, ie whether messages should be ignored
+   * if they are attached to a particular component. Defaults to false.
+   *
+   * @return  the new globalOnly value
+   */
+  @JSFProperty
+  (defaultValue = "false")
+  public abstract boolean isGlobalOnly();
 
   /**
    * Specifies whether the detailed information from the message should be shown. 
@@ -68,5 +68,5 @@
   @JSFProperty
   (defaultValue = "false")
   public abstract boolean isShowSummary();
-  
-}
+  
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIParameter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIParameter.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIParameter.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UIParameter.java Thu Jul  3 15:15:26 2008
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
+package javax.faces.component;
+
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
+
 /**
- * 
- */
+ * 
+ */
 @JSFComponent
-(clazz = "javax.faces.component.UIParameter",template=true)
-abstract class _UIParameter extends UIComponentBase
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.Parameter";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.Parameter";
+(clazz = "javax.faces.component.UIParameter",template=true)
+abstract class _UIParameter extends UIComponentBase
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.Parameter";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.Parameter";
 
   /**
    * Disable this property; although this class extends a base-class that
@@ -44,21 +44,21 @@
   public void setRendered(boolean state) {
       throw new UnsupportedOperationException();
   }
-  
-  /**
-   * The value of this component.
-   *
-   * @return  the new value value
-   */
-  @JSFProperty
-  public abstract Object getValue();
-
-  /**
-   * The name under which the value is stored.
-   *
-   * @return  the new name value
-   */
-  @JSFProperty
-  public abstract String getName();
-
-}
+  
+  /**
+   * The value of this component.
+   *
+   * @return  the new value value
+   */
+  @JSFProperty
+  public abstract Object getValue();
+
+  /**
+   * The name under which the value is stored.
+   *
+   * @return  the new name value
+   */
+  @JSFProperty
+  public abstract String getName();
+
+}

Modified: myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UISelectItem.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UISelectItem.java?rev=673847&r1=673846&r2=673847&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UISelectItem.java (original)
+++ myfaces/core/trunk_1.2.x/api/src/main/java/javax/faces/component/_UISelectItem.java Thu Jul  3 15:15:26 2008
@@ -16,26 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package javax.faces.component;
-
+package javax.faces.component;
+
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-
-/**
- *
- * UISelectItem should be nestetd inside a UISelectMany or UISelectOne component,
- * and results in  the addition of a SelectItem instance to the list of available options
- * for the parent component
- */
+
+/**
+ *
+ * UISelectItem should be nestetd inside a UISelectMany or UISelectOne component,
+ * and results in  the addition of a SelectItem instance to the list of available options
+ * for the parent component
+ */
 @JSFComponent
-(clazz = "javax.faces.component.UISelectItem",template=true)
-abstract class _UISelectItem extends UIComponentBase
-{
-
-  static public final String COMPONENT_FAMILY =
-    "javax.faces.SelectItem";
-  static public final String COMPONENT_TYPE =
-    "javax.faces.SelectItem";
+(clazz = "javax.faces.component.UISelectItem",template=true)
+abstract class _UISelectItem extends UIComponentBase
+{
+
+  static public final String COMPONENT_FAMILY =
+    "javax.faces.SelectItem";
+  static public final String COMPONENT_TYPE =
+    "javax.faces.SelectItem";
 
   /**
    * Disable this property; although this class extends a base-class that
@@ -47,55 +47,55 @@
   public void setRendered(boolean state) {
       throw new UnsupportedOperationException();
   }
-  
-  /**
-   * The initial value of this component.
-   *
-   * @return  the new value value
-   */
-  @JSFProperty
-  public abstract Object getValue();
-
-  /**
-   * Determine whether this item can be chosen by the user.
-   * When true, this item cannot be chosen by the user. If this method is
-   * ever called, then any EL-binding for the disabled property will be ignored.
-   *
-   * @return  the new itemDisabled value
-   */
-  @JSFProperty(defaultValue="false")
+  
+  /**
+   * The initial value of this component.
+   *
+   * @return  the new value value
+   */
+  @JSFProperty
+  public abstract Object getValue();
+
+  /**
+   * Determine whether this item can be chosen by the user.
+   * When true, this item cannot be chosen by the user. If this method is
+   * ever called, then any EL-binding for the disabled property will be ignored.
+   *
+   * @return  the new itemDisabled value
+   */
+  @JSFProperty(defaultValue="false")
   public abstract boolean isItemDisabled();
-
-  /**
-   * The escape setting for the label of this selection item.
-   *
-   * @return  the new itemEscaped value
-   */
-  @JSFProperty(defaultValue="false")
-  public abstract boolean isItemEscaped();
-
-  /**
-   * For use in development tools.
-   *
-   * @return  the new itemDescription value
-   */
-  @JSFProperty
-  public abstract String getItemDescription();
-
-  /**
-   * The string which will be presented to the user for this option.
-   *
-   * @return  the new itemLabel value
-   */
-  @JSFProperty
-  public abstract String getItemLabel();
-
-  /**
-   * The value for this Item.
-   *
-   * @return  the new itemValue value
-   */
-  @JSFProperty
-  public abstract Object getItemValue();
-
-}
+
+  /**
+   * The escape setting for the label of this selection item.
+   *
+   * @return  the new itemEscaped value
+   */
+  @JSFProperty(defaultValue="false")
+  public abstract boolean isItemEscaped();
+
+  /**
+   * For use in development tools.
+   *
+   * @return  the new itemDescription value
+   */
+  @JSFProperty
+  public abstract String getItemDescription();
+
+  /**
+   * The string which will be presented to the user for this option.
+   *
+   * @return  the new itemLabel value
+   */
+  @JSFProperty
+  public abstract String getItemLabel();
+
+  /**
+   * The value for this Item.
+   *
+   * @return  the new itemValue value
+   */
+  @JSFProperty
+  public abstract Object getItemValue();
+
+}