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/08/13 22:25:49 UTC

svn commit: r685669 - /myfaces/core/trunk/api/src/main/java/javax/faces/component/

Author: skitching
Date: Wed Aug 13 13:25:49 2008
New Revision: 685669

URL: http://svn.apache.org/viewvc?rev=685669&view=rev
Log:
Remove traces of old code-generation framework.
Add comments, generally tidy up code.
No logic changes.

Removed:
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.xml
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.xml
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.xml
Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UICommand.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIGraphic.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectOne.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/NamingContainer.java Wed Aug 13 13:25:49 2008
@@ -19,7 +19,40 @@
 package javax.faces.component;
 
 /**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * Interface implemented by components that provide a new "namespace" for the ids of their
+ * child components.
+ * <p>
+ * Component ids must be unique between all descendants of a NamingContainer; the JSF library
+ * will report a fatal error and refuse to process or render any view where two components
+ * in the same NamingContainer have identical id values. However a component that is a descendant
+ * of one NamingContainer component is permitted to have the same id as a component that is a
+ * descendant of a different NamingContainer component.
+ * <p>
+ * Unique component ids are used to:
+ * <ul>
+ * <li>generate unique names for HTML form fields, etc</li>
+ * <li>search for components via UIComponent.findComponent(String expr)</li>
+ * <li>on re-render after postback, match up component declarations in the view templates
+ * with existing components in the restored view tree.
+ * </ul>
+ * <p>
+ * Requiring every component in a large view (which is possibly built by including or
+ * composing multiple files together) to have an id which is different from every other id
+ * is simply unmanageable; JSF certainly must provide <i>some</i> kind of id namespacing.
+ * Therefore this base class is defined, and a few standard JSF components subclass it
+ * (in particular, f:subview).
+ * <p>
+ * When generating clientId values during rendering, descendants of a NamingContainer instance
+ * are allocated a clientId which is their own id prefixed with the clientId of the ancestor
+ * NamingContainer, eg "parentId:childId". NamingContainer components can be nested within
+ * other NamingContainer components, generating clientIds like "firstId:middleId:leafId". 
+ * <p>
+ * Not every component is a naming container; that would technically work, but the clientId
+ * values generated would quickly grow excessively long.
+ * <p>
+ * See the javadoc for this class in the 
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * for further details.
  *
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UICommand.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UICommand.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UICommand.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UICommand.java Wed Aug 13 13:25:49 2008
@@ -25,7 +25,11 @@
 import javax.faces.event.*;
 
 /**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * UICommand is a base abstraction for components that implement ActionSource.
+ * <p>
+ * See the javadoc for this class in the
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * for further details.
  *
  * @JSFComponent
  *   type = "javax.faces.Command"
@@ -35,10 +39,16 @@
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class UICommand
-        extends UIComponentBase
-        implements ActionSource
+public class UICommand extends UIComponentBase implements ActionSource
 {
+    public static final String COMPONENT_TYPE = "javax.faces.Command";
+    public static final String COMPONENT_FAMILY = "javax.faces.Command";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Button";
+    private static final boolean DEFAULT_IMMEDIATE = false;
+
+    private Boolean _immediate = null;
+    private Object _value = null;
+
     private MethodBinding _action = null;
     private MethodBinding _actionListener = null;
 
@@ -160,16 +170,6 @@
     }
 
 
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "javax.faces.Command";
-    public static final String COMPONENT_FAMILY = "javax.faces.Command";
-    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Button";
-    private static final boolean DEFAULT_IMMEDIATE = false;
-
-    private Boolean _immediate = null;
-    private Object _value = null;
-
     public UICommand()
     {
         setRendererType(DEFAULT_RENDERER_TYPE);
@@ -245,5 +245,4 @@
         _immediate = (Boolean)values[3];
         _value = values[4];
     }
-    //------------------ GENERATED CODE END ---------------------------------------
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java Wed Aug 13 13:25:49 2008
@@ -133,6 +133,12 @@
  */
 public class UIData extends UIComponentBase implements NamingContainer
 {
+    public static final String COMPONENT_TYPE = "javax.faces.Data";
+    public static final String COMPONENT_FAMILY = "javax.faces.Data";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Table";
+    private static final int DEFAULT_FIRST = 0;
+    private static final int DEFAULT_ROWS = 0;
+
     private static final int STATE_SIZE = 5;
     private static final int SUPER_STATE_INDEX = 0;
     private static final int FIRST_STATE_INDEX = 1;
@@ -147,6 +153,10 @@
     private static final int PROCESS_VALIDATORS = 2;
     private static final int PROCESS_UPDATES = 3;
 
+    private Integer _first = null;
+    private Integer _rows = null;
+    private Object _value = null;
+
     private int _rowIndex = -1;
     private String _var = null;
 
@@ -979,18 +989,6 @@
         }
     }
 
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "javax.faces.Data";
-    public static final String COMPONENT_FAMILY = "javax.faces.Data";
-    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Table";
-    private static final int DEFAULT_FIRST = 0;
-    private static final int DEFAULT_ROWS = 0;
-
-    private Integer _first = null;
-    private Integer _rows = null;
-    private Object _value = null;
-
     public UIData()
     {
         setRendererType(DEFAULT_RENDERER_TYPE);
@@ -1003,7 +1001,8 @@
 
     public void setFirst(int first)
     {
-        if (first < 0) {
+        if (first < 0)
+        {
             throw new IllegalArgumentException("Illegal value for first row: " + first);
         }
         _first = new Integer(first);
@@ -1017,7 +1016,9 @@
     public int getFirst()
     {
         if (_first != null)
+        {
             return _first.intValue();
+        }
         ValueBinding vb = getValueBinding("first");
         Number v = vb != null ? (Number) vb.getValue(getFacesContext()) : null;
         return v != null ? v.intValue() : DEFAULT_FIRST;
@@ -1031,7 +1032,9 @@
     public int getRows()
     {
         if (_rows != null)
+        {
             return _rows.intValue();
+        }
         ValueBinding vb = getValueBinding("rows");
         Number v = vb != null ? (Number) vb.getValue(getFacesContext()) : null;
         return v != null ? v.intValue() : DEFAULT_ROWS;
@@ -1053,7 +1056,4 @@
         ValueBinding vb = getValueBinding("value");
         return vb != null ? vb.getValue(getFacesContext()) : null;
     }
-
-    //------------------ GENERATED CODE END ---------------------------------------
-
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIGraphic.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIGraphic.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIGraphic.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIGraphic.java Wed Aug 13 13:25:49 2008
@@ -22,7 +22,11 @@
 import javax.faces.el.ValueBinding;
 
 /**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * Displays a graphical image.
+ * <p>
+ * See the javadoc for this class in the
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * for further details.
  *
  * @JSFComponent
  *   type = "javax.faces.Graphic"
@@ -35,9 +39,15 @@
 public class UIGraphic
         extends UIComponentBase
 {
+    public static final String COMPONENT_TYPE = "javax.faces.Graphic";
+    public static final String COMPONENT_FAMILY = "javax.faces.Graphic";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Image";
+
     private static final String URL_PROPERTY = "url";
     private static final String VALUE_PROPERTY = "value";
 
+    private Object _value = null;
+
     /**
      * An alias for the "value" attribute.
      * 
@@ -78,15 +88,6 @@
         }
     }
 
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "javax.faces.Graphic";
-    public static final String COMPONENT_FAMILY = "javax.faces.Graphic";
-    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Image";
-
-    private Object _value = null;
-
     public UIGraphic()
     {
         setRendererType(DEFAULT_RENDERER_TYPE);
@@ -115,7 +116,6 @@
         return vb != null ? vb.getValue(getFacesContext()) : null;
     }
 
-
     public Object saveState(FacesContext context)
     {
         Object values[] = new Object[2];
@@ -130,5 +130,4 @@
         super.restoreState(context, values[0]);
         _value = values[1];
     }
-    //------------------ GENERATED CODE END ---------------------------------------
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java Wed Aug 13 13:25:49 2008
@@ -46,16 +46,23 @@
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class UIInput
-        extends UIOutput
-        implements EditableValueHolder
+public class UIInput extends UIOutput implements EditableValueHolder
 {
+    public static final String COMPONENT_TYPE = "javax.faces.Input";
+    public static final String COMPONENT_FAMILY = "javax.faces.Input";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Text";
+    private static final boolean DEFAULT_IMMEDIATE = false;
+    private static final boolean DEFAULT_REQUIRED = false;
+
     public static final String CONVERSION_MESSAGE_ID = "javax.faces.component.UIInput.CONVERSION";
     public static final String REQUIRED_MESSAGE_ID = "javax.faces.component.UIInput.REQUIRED";
     private static final String ERROR_HANDLING_EXCEPTION_LIST = "org.apache.myfaces.errorHandling.exceptionList";
 
     private static final Validator[] EMPTY_VALIDATOR_ARRAY = new Validator[0];
 
+    private Boolean _immediate = null;
+    private Boolean _required = null;
+
     private Object _submittedValue = null;
     private boolean _localValueSet = false;
     private boolean _valid = true;
@@ -333,10 +340,6 @@
      * For development and production, we want to offer a single point
      * to which error-handlers can attach. So we queue up all ocurring
      * exceptions and later pass them to the configured error-handler.
-     *
-     * @param context
-     * @param binding
-     * @param e
      */
     private void queueExceptionInRequest(FacesContext context, ValueBinding binding, Exception e) {
         List li = (List) context.getExternalContext().getRequestMap().get(ERROR_HANDLING_EXCEPTION_LIST);
@@ -561,18 +564,6 @@
 
     }
 
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "javax.faces.Input";
-    public static final String COMPONENT_FAMILY = "javax.faces.Input";
-    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Text";
-    private static final boolean DEFAULT_IMMEDIATE = false;
-    private static final boolean DEFAULT_REQUIRED = false;
-
-    private Boolean _immediate = null;
-    private Boolean _required = null;
-
     public UIInput()
     {
         setRendererType(DEFAULT_RENDERER_TYPE);
@@ -624,7 +615,4 @@
         Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
         return v != null ? v.booleanValue() : DEFAULT_REQUIRED;
     }
-
-
-    //------------------ GENERATED CODE END ---------------------------------------
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java Wed Aug 13 13:25:49 2008
@@ -18,29 +18,22 @@
  */
 package javax.faces.component;
 
-
-
 /**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
- *
- * @JSFComponent
- *   type = "javax.faces.NamingContainer"
- *   family = "javax.faces.NamingContainer"
- *   desc = "UINamingContainer"
- *   
+ * Base class for components that provide a new "namespace" for the ids of their child components.
+ * <p>
+ * See the documentation on interface NamingContainer for more details.
+ * 
+ * @JSFComponent type = "javax.faces.NamingContainer" family = "javax.faces.NamingContainer" desc =
+ *               "UINamingContainer"
+ * 
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class UINamingContainer
-        extends UIComponentBase
-        implements NamingContainer
+public class UINamingContainer extends UIComponentBase implements NamingContainer
 {
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
     public static final String COMPONENT_TYPE = "javax.faces.NamingContainer";
     public static final String COMPONENT_FAMILY = "javax.faces.NamingContainer";
 
-
     public UINamingContainer()
     {
     }
@@ -49,7 +42,4 @@
     {
         return COMPONENT_FAMILY;
     }
-
-
-    //------------------ GENERATED CODE END ---------------------------------------
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutput.java Wed Aug 13 13:25:49 2008
@@ -23,27 +23,22 @@
 import javax.faces.el.ValueBinding;
 
 /**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
- *
+ * Displays a value to the user.
+ * <p>
+ * See the javadoc for this class in the
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * for further details.
+ * 
  * @JSFComponent
  *   type = "javax.faces.Output"
  *   family = "javax.faces.Output"
  *   desc = "UIOutput displays a value to the user"
- *
+ * 
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class UIOutput
-        extends UIComponentBase
-        implements ValueHolder
+public class UIOutput extends UIComponentBase implements ValueHolder
 {
-    public Object getLocalValue()
-    {
-        return _value;
-    }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
     public static final String COMPONENT_TYPE = "javax.faces.Output";
     public static final String COMPONENT_FAMILY = "javax.faces.Output";
     private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Text";
@@ -51,6 +46,11 @@
     private Converter _converter = null;
     private Object _value = null;
 
+    public Object getLocalValue()
+    {
+        return _value;
+    }
+
     public UIOutput()
     {
         setRendererType(DEFAULT_RENDERER_TYPE);
@@ -67,19 +67,21 @@
     }
 
     /**
-     * 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.
-     *  
+     * 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.
+     * 
      * @JSFProperty
      */
     public Converter getConverter()
     {
-        if (_converter != null) return _converter;
+        if (_converter != null)
+        {
+            return _converter;
+        }
         ValueBinding vb = getValueBinding("converter");
-        return vb != null ? (Converter)vb.getValue(getFacesContext()) : null;
+        return vb != null ? (Converter) vb.getValue(getFacesContext()) : null;
     }
 
     public void setValue(Object value)
@@ -88,33 +90,34 @@
     }
 
     /**
-     * The initial value of this component. This value is generally
-     * set as a value-binding in the form #{myBean.myProperty}, where
-     * myProperty can be any data-type of Java (also user-defined data-types),
-     * if a converter for this data-type exists.
+     * The initial value of this component. This value is generally set as a value-binding in the
+     * form #{myBean.myProperty}, where myProperty can be any data-type of Java (also user-defined
+     * data-types), if a converter for this data-type exists.
      * 
      * Special cases:
      * 
-     * 1) f:selectItems - value needs to bind to a list (or an array) of javax.faces.model.SelectItem-instances
+     * 1) f:selectItems - value needs to bind to a list (or an array) of
+     * javax.faces.model.SelectItem-instances
+     * 
+     * 2) components implementing UISelectMany (e.g. h:selectManyCheckbox) - value needs to bind to
+     * a list (or an array) of values, where the values need to be of the same data-type as the
+     * choices of the associated f:selectItems-component
      * 
-     * 2) components implementing UISelectMany (e.g. h:selectManyCheckbox) -
-     * value needs to bind to a list (or an array) of values, where the values need to be
-     * of the same data-type as the choices of the associated f:selectItems-component
-     * 
-     * 3) components implementing UIData (e.g. h:dataTable) -
-     * value needs to bind to a list (or an array) of values,
-     * which will be iterated over when the data-table is processed
+     * 3) components implementing UIData (e.g. h:dataTable) - value needs to bind to a list (or an
+     * array) of values, which will be iterated over when the data-table is processed
      * 
      * @JSFProperty
      */
     public Object getValue()
     {
-        if (_value != null) return _value;
+        if (_value != null)
+        {
+            return _value;
+        }
         ValueBinding vb = getValueBinding("value");
         return vb != null ? vb.getValue(getFacesContext()) : null;
     }
 
-
     public Object saveState(FacesContext context)
     {
         Object values[] = new Object[3];
@@ -126,10 +129,9 @@
 
     public void restoreState(FacesContext context, Object state)
     {
-        Object values[] = (Object[])state;
+        Object values[] = (Object[]) state;
         super.restoreState(context, values[0]);
-        _converter = (Converter)restoreAttachedState(context, values[1]);
+        _converter = (Converter) restoreAttachedState(context, values[1]);
         _value = values[2];
     }
-    //------------------ GENERATED CODE END ---------------------------------------
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectBoolean.java Wed Aug 13 13:25:49 2008
@@ -22,7 +22,13 @@
 
 
 /**
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * A component that allows the user to select or unselect an object.
+ * <p>
+ * This can also be used to choose between two states such as true/false or on/off.
+ * <p>
+ * See the javadoc for this class in the
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * for further details.
  *
  * @JSFComponent
  *   type = "javax.faces.SelectBoolean"
@@ -34,13 +40,20 @@
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class UISelectBoolean
-        extends UIInput
+public class UISelectBoolean extends UIInput
 {
+    public static final String COMPONENT_TYPE = "javax.faces.SelectBoolean";
+    public static final String COMPONENT_FAMILY = "javax.faces.SelectBoolean";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Checkbox";
 
-    public void setSelected(boolean selected)
+    public UISelectBoolean()
     {
-        setValue(Boolean.valueOf(selected));
+        setRendererType(DEFAULT_RENDERER_TYPE);
+    }
+
+    public String getFamily()
+    {
+        return COMPONENT_FAMILY;
     }
 
     public boolean isSelected()
@@ -52,6 +65,11 @@
         return value != null && value.booleanValue();
     }
 
+    public void setSelected(boolean selected)
+    {
+        setValue(Boolean.valueOf(selected));
+    }
+
     public ValueBinding getValueBinding(String name)
     {
         if (name == null) throw new NullPointerException("name");
@@ -78,24 +96,4 @@
             super.setValueBinding(name, binding);
         }
     }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "javax.faces.SelectBoolean";
-    public static final String COMPONENT_FAMILY = "javax.faces.SelectBoolean";
-    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Checkbox";
-
-
-    public UISelectBoolean()
-    {
-        setRendererType(DEFAULT_RENDERER_TYPE);
-    }
-
-    public String getFamily()
-    {
-        return COMPONENT_FAMILY;
-    }
-
-
-    //------------------ GENERATED CODE END ---------------------------------------
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectMany.java Wed Aug 13 13:25:49 2008
@@ -55,8 +55,22 @@
  */
 public class UISelectMany extends UIInput
 {
+    public static final String COMPONENT_TYPE = "javax.faces.SelectMany";
+    public static final String COMPONENT_FAMILY = "javax.faces.SelectMany";
     public static final String INVALID_MESSAGE_ID = "javax.faces.component.UISelectMany.INVALID";
 
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Listbox";
+
+    public UISelectMany()
+    {
+        setRendererType(DEFAULT_RENDERER_TYPE);
+    }
+
+    public String getFamily()
+    {
+        return COMPONENT_FAMILY;
+    }
+
     public Object[] getSelectedValues()
     {
         return (Object[]) getValue();
@@ -380,22 +394,4 @@
             }
         }
     }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "javax.faces.SelectMany";
-    public static final String COMPONENT_FAMILY = "javax.faces.SelectMany";
-    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Listbox";
-
-    public UISelectMany()
-    {
-        setRendererType(DEFAULT_RENDERER_TYPE);
-    }
-
-    public String getFamily()
-    {
-        return COMPONENT_FAMILY;
-    }
-
-    //------------------ GENERATED CODE END ---------------------------------------
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectOne.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectOne.java?rev=685669&r1=685668&r2=685669&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectOne.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UISelectOne.java Wed Aug 13 13:25:49 2008
@@ -27,7 +27,9 @@
  * UISelectItems; these define the set of possible options that the
  * user can choose from.
  * <p>
- * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * See the javadoc for this class in the
+ * <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * for further details.
  *
  * @JSFComponent
  *   type = "javax.faces.SelectOne"
@@ -39,8 +41,22 @@
  */
 public class UISelectOne extends UIInput
 {
+    public static final String COMPONENT_TYPE = "javax.faces.SelectOne";
+    public static final String COMPONENT_FAMILY = "javax.faces.SelectOne";
     public static final String INVALID_MESSAGE_ID = "javax.faces.component.UISelectOne.INVALID";
 
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Menu";
+
+    public UISelectOne()
+    {
+        setRendererType(DEFAULT_RENDERER_TYPE);
+    }
+
+    public String getFamily()
+    {
+        return COMPONENT_FAMILY;
+    }
+
     /**
      * Verify that the result of converting the newly submitted value is
      * <i>equal</i> to the value property of one of the child SelectItem
@@ -65,22 +81,4 @@
             setValid(false);
         }
     }
-
-    //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
-
-    public static final String COMPONENT_TYPE = "javax.faces.SelectOne";
-    public static final String COMPONENT_FAMILY = "javax.faces.SelectOne";
-    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Menu";
-
-    public UISelectOne()
-    {
-        setRendererType(DEFAULT_RENDERER_TYPE);
-    }
-
-    public String getFamily()
-    {
-        return COMPONENT_FAMILY;
-    }
-
-    //------------------ GENERATED CODE END ---------------------------------------
 }