myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grantsm...@apache.org
Subject svn commit: r348002 - /myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/
Date Mon, 21 Nov 2005 22:04:47 GMT
Author: grantsmith
Date: Mon Nov 21 14:04:42 2005
New Revision: 348002

URL: http://svn.apache.org/viewcvs?rev=348002&view=rev
Log:
Added escape attributes to Tags from MYFACES-407. Resolves MYFACES-849

Modified:
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java?rev=348002&r1=348001&r2=348002&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java
(original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyCheckboxTag.java
Mon Nov 21 14:04:42 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectManyCheckbox;
 import org.apache.myfaces.taglib.html.HtmlSelectManyCheckboxTagBase;
+import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 
@@ -39,9 +40,9 @@
     {
         return "org.apache.myfaces.Checkbox";
     }
-    
+
+    private String _escape;
     private String _layoutWidth;
-    
     private String _enabledOnUserRole;
     private String _visibleOnUserRole;
 
@@ -53,7 +54,7 @@
         super.release();
 
         _layoutWidth=null;
-
+        _escape=null;
         _enabledOnUserRole=null;
         _visibleOnUserRole=null;
 
@@ -66,7 +67,7 @@
     {
         super.setProperties(component);
         setStringProperty(component, "layoutWidth", _layoutWidth);
-
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
 
@@ -78,6 +79,11 @@
     public void setLayoutWidth(String layoutWidth)
     {
         _layoutWidth = layoutWidth;
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java?rev=348002&r1=348001&r2=348002&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java
(original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyListboxTag.java
Mon Nov 21 14:04:42 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectManyListbox;
 import org.apache.myfaces.taglib.html.HtmlSelectListboxTagBase;
+import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 
@@ -39,6 +40,7 @@
         return "org.apache.myfaces.Listbox";
     }
 
+    private String _escape;
     private String _enabledOnUserRole;
     private String _visibleOnUserRole;
 
@@ -48,6 +50,7 @@
 
     public void release() {
         super.release();
+        _escape=null;
         _enabledOnUserRole=null;
         _visibleOnUserRole=null;
 
@@ -59,12 +62,18 @@
     protected void setProperties(UIComponent component)
     {
         super.setProperties(component);
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
 
         setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR,
_displayValueOnlyStyle);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR,
_displayValueOnlyStyleClass);
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java?rev=348002&r1=348001&r2=348002&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java
(original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectManyMenuTag.java
Mon Nov 21 14:04:42 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectManyMenu;
 import org.apache.myfaces.taglib.html.HtmlSelectMenuTagBase;
+import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 
@@ -39,6 +40,7 @@
         return "org.apache.myfaces.Menu";
     }
 
+    private String _escape;
     private String _enabledOnUserRole;
     private String _visibleOnUserRole;
 
@@ -48,6 +50,7 @@
 
     public void release() {
         super.release();
+        _escape=null;
         _enabledOnUserRole=null;
         _visibleOnUserRole=null;
 
@@ -59,12 +62,18 @@
     protected void setProperties(UIComponent component)
     {
         super.setProperties(component);
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
 
         setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR,
_displayValueOnlyStyle);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR,
_displayValueOnlyStyleClass);
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java?rev=348002&r1=348001&r2=348002&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java
(original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneListboxTag.java
Mon Nov 21 14:04:42 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectOneListbox;
 import org.apache.myfaces.taglib.html.HtmlSelectListboxTagBase;
+import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 
@@ -39,6 +40,7 @@
         return "org.apache.myfaces.Listbox";
     }
 
+    private String _escape;
     private String _enabledOnUserRole;
     private String _visibleOnUserRole;
 
@@ -48,6 +50,7 @@
 
     public void release() {
         super.release();
+        _escape=null;
         _enabledOnUserRole=null;
         _visibleOnUserRole=null;
 
@@ -59,12 +62,18 @@
     protected void setProperties(UIComponent component)
     {
         super.setProperties(component);
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
 
         setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR,
_displayValueOnlyStyle);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR,
_displayValueOnlyStyleClass);
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java?rev=348002&r1=348001&r2=348002&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java
(original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneMenuTag.java
Mon Nov 21 14:04:42 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectOneMenu;
 import org.apache.myfaces.taglib.html.HtmlSelectMenuTagBase;
+import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 
@@ -39,6 +40,7 @@
         return "org.apache.myfaces.Menu";
     }
 
+    private String _escape;
     private String _enabledOnUserRole;
     private String _visibleOnUserRole;
 
@@ -48,6 +50,7 @@
 
     public void release() {
         super.release();
+        _escape=null;
         _enabledOnUserRole=null;
         _visibleOnUserRole=null;
 
@@ -59,12 +62,18 @@
     protected void setProperties(UIComponent component)
     {
         super.setProperties(component);
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
 
         setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR,
_displayValueOnlyStyle);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR,
_displayValueOnlyStyleClass);
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java?rev=348002&r1=348001&r2=348002&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java
(original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/taglib/html/ext/HtmlSelectOneRadioTag.java
Mon Nov 21 14:04:42 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlSelectOneRadio;
 import org.apache.myfaces.taglib.html.HtmlSelectOneRadioTagBase;
+import org.apache.myfaces.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 
@@ -40,6 +41,7 @@
         return "org.apache.myfaces.Radio";
     }
 
+    private String _escape;
     private String _enabledOnUserRole;
     private String _visibleOnUserRole;
 
@@ -49,6 +51,7 @@
 
     public void release() {
         super.release();
+        _escape=null;
         _enabledOnUserRole=null;
         _visibleOnUserRole=null;
 
@@ -60,12 +63,18 @@
     protected void setProperties(UIComponent component)
     {
         super.setProperties(component);
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
 
         setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, _displayValueOnly);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR,
_displayValueOnlyStyle);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR,
_displayValueOnlyStyleClass);
+    }
+
+    public void setEscape(String escape)
+    {
+        _escape = escape;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)



Mime
View raw message