You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2005/11/09 00:19:41 UTC

svn commit: r331925 - /myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/

Author: grantsmith
Date: Tue Nov  8 15:19:33 2005
New Revision: 331925

URL: http://svn.apache.org/viewcvs?rev=331925&view=rev
Log:
Implemented escape attribute for HtmlSelect* tomahawk component. MYFACES-407

Modified:
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.xml
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.xml
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.xml
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.xml
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.xml
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.xml
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.xml

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.java Tue Nov  8 15:19:33 2005
@@ -50,12 +50,12 @@
     public static final String COMPONENT_TYPE = "org.apache.myfaces.HtmlSelectBooleanCheckbox";
     private static final boolean DEFAULT_DISPLAYVALUEONLY = false;
     private static final boolean DEFAULT_ESCAPE = true;
-    
+
     private String _enabledOnUserRole = null;
     private String _visibleOnUserRole = null;
     private Boolean _displayValueOnly = null;
-	private String _displayValueOnlyStyle = null;
-	private String _displayValueOnlyStyleClass = null;
+    private String _displayValueOnlyStyle = null;
+    private String _displayValueOnlyStyleClass = null;
     private Boolean _escape = null;
 
     public HtmlSelectBooleanCheckbox()
@@ -125,7 +125,7 @@
         _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
     }
 
-public void setEscape(boolean escape)
+    public void setEscape(boolean escape)
     {
         _escape = Boolean.valueOf(escape);
     }

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.xml?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.xml (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectBooleanCheckbox.xml Tue Nov  8 15:19:33 2005
@@ -27,4 +27,9 @@
         <name>displayValueOnlyStyleClass</name>
         <type>java.lang.String</type>
     </field>
+    <field>
+        <name>escape</name>
+        <type>boolean</type>
+        <default-value>true</default-value>
+    </field>
 </component>

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java Tue Nov  8 15:19:33 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.EscapeCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 import org.apache.myfaces.custom.ExtendedComponentBase;
 
@@ -30,7 +31,7 @@
  */
 public class HtmlSelectManyCheckbox
         extends javax.faces.component.html.HtmlSelectManyCheckbox
-        implements UserRoleAware, DisplayValueOnlyCapable, ExtendedComponentBase
+        implements UserRoleAware, DisplayValueOnlyCapable, ExtendedComponentBase, EscapeCapable
 {
 
 
@@ -102,7 +103,7 @@
         ValueBinding vb = getValueBinding("displayValueOnly");
         Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
         return v != null;
-    }    
+    }
 
     public boolean isDisplayValueOnly() {
         if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
@@ -169,6 +170,21 @@
     //------------------ GENERATED CODE END ---------------------------------------
 
     private Boolean _forceId = null;
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
 
     public void setForceId(boolean b)
     {

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.xml?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.xml (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.xml Tue Nov  8 15:19:33 2005
@@ -31,4 +31,9 @@
         <name>displayValueOnlyStyleClass</name>
         <type>java.lang.String</type>
     </field>
+    <field>
+        <name>escape</name>
+        <type>boolean</type>
+        <default-value>true</default-value>
+    </field>
 </component>

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.java Tue Nov  8 15:19:33 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.EscapeCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 
 import javax.faces.context.FacesContext;
@@ -29,7 +30,7 @@
  */
 public class HtmlSelectManyListbox
         extends javax.faces.component.html.HtmlSelectManyListbox
-        implements UserRoleAware, DisplayValueOnlyCapable
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
 {
     public String getClientId(FacesContext context)
     {
@@ -87,7 +88,7 @@
         ValueBinding vb = getValueBinding("displayValueOnly");
         Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
         return v != null;
-    }    
+    }
 
     public boolean isDisplayValueOnly() {
         if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
@@ -149,4 +150,20 @@
         _displayValueOnlyStyleClass = (String)values[5];
     }
     //------------------ GENERATED CODE END ---------------------------------------
+
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
 }

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.xml?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.xml (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyListbox.xml Tue Nov  8 15:19:33 2005
@@ -27,4 +27,9 @@
         <name>displayValueOnlyStyleClass</name>
         <type>java.lang.String</type>
     </field>
+    <field>
+        <name>escape</name>
+        <type>boolean</type>
+        <default-value>true</default-value>
+    </field>
 </component>

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.java Tue Nov  8 15:19:33 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.EscapeCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 
 import javax.faces.context.FacesContext;
@@ -29,7 +30,7 @@
  */
 public class HtmlSelectManyMenu
         extends javax.faces.component.html.HtmlSelectManyMenu
-        implements UserRoleAware, DisplayValueOnlyCapable
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
 {
     public String getClientId(FacesContext context)
     {
@@ -87,7 +88,7 @@
         ValueBinding vb = getValueBinding("displayValueOnly");
         Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
         return v != null;
-    }    
+    }
 
     public boolean isDisplayValueOnly() {
         if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
@@ -149,4 +150,19 @@
         _displayValueOnlyStyleClass = (String)values[5];
     }
     //------------------ GENERATED CODE END ---------------------------------------
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
 }

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.xml?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.xml (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectManyMenu.xml Tue Nov  8 15:19:33 2005
@@ -27,4 +27,9 @@
         <name>displayValueOnlyStyleClass</name>
         <type>java.lang.String</type>
     </field>
+    <field>
+        <name>escape</name>
+        <type>boolean</type>
+        <default-value>true</default-value>
+    </field>
 </component>

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.java Tue Nov  8 15:19:33 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.EscapeCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 
 import javax.faces.context.FacesContext;
@@ -29,7 +30,7 @@
  */
 public class HtmlSelectOneListbox
         extends javax.faces.component.html.HtmlSelectOneListbox
-        implements UserRoleAware, DisplayValueOnlyCapable
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
 {
     public String getClientId(FacesContext context)
     {
@@ -87,7 +88,7 @@
         ValueBinding vb = getValueBinding("displayValueOnly");
         Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
         return v != null;
-    }    
+    }
 
     public boolean isDisplayValueOnly() {
         if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
@@ -149,4 +150,20 @@
         _displayValueOnlyStyleClass = (String)values[5];
     }
     //------------------ GENERATED CODE END ---------------------------------------
+
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
 }

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.xml?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.xml (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneListbox.xml Tue Nov  8 15:19:33 2005
@@ -27,4 +27,9 @@
         <name>displayValueOnlyStyleClass</name>
         <type>java.lang.String</type>
     </field>
+    <field>
+        <name>escape</name>
+        <type>boolean</type>
+        <default-value>true</default-value>
+    </field>
 </component>

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.java Tue Nov  8 15:19:33 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.EscapeCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 
 import javax.faces.context.FacesContext;
@@ -29,7 +30,7 @@
  */
 public class HtmlSelectOneMenu
         extends javax.faces.component.html.HtmlSelectOneMenu
-        implements UserRoleAware, DisplayValueOnlyCapable
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
 {
     public String getClientId(FacesContext context)
     {
@@ -87,7 +88,7 @@
         ValueBinding vb = getValueBinding("displayValueOnly");
         Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
         return v != null;
-    }    
+    }
 
     public boolean isDisplayValueOnly() {
         if (_displayValueOnly != null) return _displayValueOnly.booleanValue();
@@ -149,4 +150,20 @@
         _displayValueOnlyStyleClass = (String)values[5];
     }
     //------------------ GENERATED CODE END ---------------------------------------
+    
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
 }

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.xml?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.xml (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneMenu.xml Tue Nov  8 15:19:33 2005
@@ -27,4 +27,9 @@
         <name>displayValueOnlyStyleClass</name>
         <type>java.lang.String</type>
     </field>
+    <field>
+        <name>escape</name>
+        <type>boolean</type>
+        <default-value>true</default-value>
+    </field>
 </component>

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.java Tue Nov  8 15:19:33 2005
@@ -30,6 +30,7 @@
 
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.EscapeCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 import org.apache.myfaces.util.MessageUtils;
 
@@ -39,7 +40,7 @@
  */
 public class HtmlSelectOneRadio
         extends javax.faces.component.html.HtmlSelectOneRadio
-        implements UserRoleAware, DisplayValueOnlyCapable
+        implements UserRoleAware, DisplayValueOnlyCapable, EscapeCapable
 {
 		public String getClientId(FacesContext context)
     {
@@ -51,7 +52,7 @@
 
         return clientId;
     }
-   
+
 		/**
      * Overridden method, as with extended seletOne, value doesn't necessaraly
      * have to be contained within select list, for example, when forceId="true" and
@@ -85,14 +86,14 @@
             	String clientId = this.getClientId(context);
             	Iterator messages = context.getMessages(clientId);
             	boolean messageExists = messages.hasNext();
-            	
+
             	if(!messageExists)
             	{
             		//Add message
             		FacesMessage message = MessageUtils.getMessage(REQUIRED_MESSAGE_ID, new Object[]{clientId});
             		message.setSeverity(FacesMessage.SEVERITY_WARN);
             		context.addMessage(clientId, message);
-            		
+
                 setValid(false);
             	}
                 return;
@@ -105,7 +106,7 @@
             }
         }
     }
-		
+
     private static void callValidators(FacesContext context, UIInput input, Object convertedValue)
     {
         Validator[] validators = input.getValidators();
@@ -263,4 +264,20 @@
         _displayValueOnlyStyleClass = (String)values[5];
     }
     //------------------ GENERATED CODE END ---------------------------------------
+
+    private Boolean _escape = null;
+    private static final boolean DEFAULT_ESCAPE = true;
+
+    public void setEscape(boolean escape)
+    {
+        _escape = Boolean.valueOf(escape);
+    }
+
+    public boolean isEscape()
+    {
+        if (_escape != null) return _escape.booleanValue();
+        ValueBinding vb = getValueBinding("escape");
+        Boolean v = vb != null ? (Boolean)vb.getValue(getFacesContext()) : null;
+        return v != null ? v.booleanValue() : DEFAULT_ESCAPE;
+    }
 }

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.xml
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.xml?rev=331925&r1=331924&r2=331925&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.xml (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlSelectOneRadio.xml Tue Nov  8 15:19:33 2005
@@ -27,4 +27,9 @@
         <name>displayValueOnlyStyleClass</name>
         <type>java.lang.String</type>
     </field>
+    <field>
+        <name>escape</name>
+        <type>boolean</type>
+        <default-value>true</default-value>
+    </field>
 </component>