myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r351675 [3/4] - in /myfaces: api/trunk/src/java/javax/faces/component/ api/trunk/src/java/javax/faces/component/html/ sandbox/trunk/src/java/org/apache/myfaces/custom/comparetovalidator/ sandbox/trunk/src/java/org/apache/myfaces/custom/sche...
Date Fri, 02 Dec 2005 10:56:31 GMT
Modified: myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneRadio.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneRadio.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneRadio.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/html/HtmlSelectOneRadio.java Fri Dec  2 02:55:32 2005
@@ -76,7 +76,7 @@
     {
         if (_accesskey != null) return _accesskey;
         ValueBinding vb = getValueBinding("accesskey");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setBorder(int border)
@@ -101,7 +101,7 @@
     {
         if (_dir != null) return _dir;
         ValueBinding vb = getValueBinding("dir");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisabled(boolean disabled)
@@ -126,7 +126,7 @@
     {
         if (_disabledClass != null) return _disabledClass;
         ValueBinding vb = getValueBinding("disabledClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setEnabledClass(String enabledClass)
@@ -138,7 +138,7 @@
     {
         if (_enabledClass != null) return _enabledClass;
         ValueBinding vb = getValueBinding("enabledClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setLang(String lang)
@@ -150,7 +150,7 @@
     {
         if (_lang != null) return _lang;
         ValueBinding vb = getValueBinding("lang");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setLayout(String layout)
@@ -162,7 +162,7 @@
     {
         if (_layout != null) return _layout;
         ValueBinding vb = getValueBinding("layout");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnblur(String onblur)
@@ -174,7 +174,7 @@
     {
         if (_onblur != null) return _onblur;
         ValueBinding vb = getValueBinding("onblur");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnchange(String onchange)
@@ -186,7 +186,7 @@
     {
         if (_onchange != null) return _onchange;
         ValueBinding vb = getValueBinding("onchange");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnclick(String onclick)
@@ -198,7 +198,7 @@
     {
         if (_onclick != null) return _onclick;
         ValueBinding vb = getValueBinding("onclick");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOndblclick(String ondblclick)
@@ -210,7 +210,7 @@
     {
         if (_ondblclick != null) return _ondblclick;
         ValueBinding vb = getValueBinding("ondblclick");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnfocus(String onfocus)
@@ -222,7 +222,7 @@
     {
         if (_onfocus != null) return _onfocus;
         ValueBinding vb = getValueBinding("onfocus");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnkeydown(String onkeydown)
@@ -234,7 +234,7 @@
     {
         if (_onkeydown != null) return _onkeydown;
         ValueBinding vb = getValueBinding("onkeydown");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnkeypress(String onkeypress)
@@ -246,7 +246,7 @@
     {
         if (_onkeypress != null) return _onkeypress;
         ValueBinding vb = getValueBinding("onkeypress");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnkeyup(String onkeyup)
@@ -258,7 +258,7 @@
     {
         if (_onkeyup != null) return _onkeyup;
         ValueBinding vb = getValueBinding("onkeyup");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmousedown(String onmousedown)
@@ -270,7 +270,7 @@
     {
         if (_onmousedown != null) return _onmousedown;
         ValueBinding vb = getValueBinding("onmousedown");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmousemove(String onmousemove)
@@ -282,7 +282,7 @@
     {
         if (_onmousemove != null) return _onmousemove;
         ValueBinding vb = getValueBinding("onmousemove");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmouseout(String onmouseout)
@@ -294,7 +294,7 @@
     {
         if (_onmouseout != null) return _onmouseout;
         ValueBinding vb = getValueBinding("onmouseout");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmouseover(String onmouseover)
@@ -306,7 +306,7 @@
     {
         if (_onmouseover != null) return _onmouseover;
         ValueBinding vb = getValueBinding("onmouseover");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmouseup(String onmouseup)
@@ -318,7 +318,7 @@
     {
         if (_onmouseup != null) return _onmouseup;
         ValueBinding vb = getValueBinding("onmouseup");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnselect(String onselect)
@@ -330,7 +330,7 @@
     {
         if (_onselect != null) return _onselect;
         ValueBinding vb = getValueBinding("onselect");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setReadonly(boolean readonly)
@@ -355,7 +355,7 @@
     {
         if (_style != null) return _style;
         ValueBinding vb = getValueBinding("style");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setStyleClass(String styleClass)
@@ -367,7 +367,7 @@
     {
         if (_styleClass != null) return _styleClass;
         ValueBinding vb = getValueBinding("styleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setTabindex(String tabindex)
@@ -379,7 +379,7 @@
     {
         if (_tabindex != null) return _tabindex;
         ValueBinding vb = getValueBinding("tabindex");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setTitle(String title)
@@ -391,7 +391,7 @@
     {
         if (_title != null) return _title;
         ValueBinding vb = getValueBinding("title");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Added: myfaces/api/trunk/src/java/javax/faces/component/html/_ComponentUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/html/_ComponentUtils.java?rev=351675&view=auto
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/html/_ComponentUtils.java (added)
+++ myfaces/api/trunk/src/java/javax/faces/component/html/_ComponentUtils.java Fri Dec  2 02:55:32 2005
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.faces.component.html;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Mathias Brökelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+class _ComponentUtils
+{
+    private _ComponentUtils()
+    {
+    }
+
+    static String getStringValue(FacesContext context, ValueBinding vb)
+    {
+        Object value = vb.getValue(context);
+        if (value == null)
+        {
+            return null;
+        }
+        return value.toString();
+    }
+
+}

Propchange: myfaces/api/trunk/src/java/javax/faces/component/html/_ComponentUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/api/trunk/src/java/javax/faces/component/html/_ComponentUtils.java
------------------------------------------------------------------------------
    svn:keywords = URL Author Revision Date

Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/comparetovalidator/CompareToValidator.java Fri Dec  2 02:55:32 2005
@@ -37,6 +37,7 @@
 import javax.faces.validator.ValidatorException;
 
 import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 /**
  * @author Mike Kienenberger (latest modification by $Author$)
@@ -363,7 +364,7 @@
 	public String getFor() {
         if (_foreignComponentName != null) return _foreignComponentName;
         ValueBinding vb = getValueBinding("for");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
 	}
 
 	/**
@@ -377,7 +378,7 @@
     {
         if (_operator != null) return _operator;
         ValueBinding vb = getValueBinding("operator");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
     
     public void setOperator(String operator)
@@ -401,7 +402,7 @@
     {
         if (_message != null) return _message;
         ValueBinding vb = getValueBinding("message");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
     
     public void setMessage(String message)
@@ -413,7 +414,7 @@
     {
         if (_alternateOperatorName != null) return _alternateOperatorName;
         ValueBinding vb = getValueBinding("alternateOperatorName");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
     
     public void setAlternateOperatorName(String alternateOperatorName)

Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlPlanner.java Fri Dec  2 02:55:32 2005
@@ -21,6 +21,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.util._ComponentUtils;
 
 
 /**
@@ -61,7 +62,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -73,7 +74,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java
URL: http://svn.apache.org/viewcvs/myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java (original)
+++ myfaces/sandbox/trunk/src/java/org/apache/myfaces/custom/schedule/HtmlSchedule.java Fri Dec  2 02:55:32 2005
@@ -21,6 +21,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.util._ComponentUtils;
 
 
 /**
@@ -60,7 +61,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -72,7 +73,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Added: myfaces/share/trunk/src/java/org/apache/myfaces/util/_ComponentUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/util/_ComponentUtils.java?rev=351675&view=auto
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/util/_ComponentUtils.java (added)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/util/_ComponentUtils.java Fri Dec  2 02:55:32 2005
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.util;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * @author Mathias Brökelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class _ComponentUtils
+{
+    private _ComponentUtils()
+    {
+    }
+
+    public static String getStringValue(FacesContext context, ValueBinding vb)
+    {
+        Object value = vb.getValue(context);
+        if (value != null)
+        {
+            return value.toString();
+        }
+        return null;
+    }
+
+}

Propchange: myfaces/share/trunk/src/java/org/apache/myfaces/util/_ComponentUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/share/trunk/src/java/org/apache/myfaces/util/_ComponentUtils.java
------------------------------------------------------------------------------
    svn:keywords = URL Author Revision Date

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandButton.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandButton.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandButton.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandButton.java Fri Dec  2 02:55:32 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -63,7 +64,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -75,7 +76,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlCommandLink.java Fri Dec  2 02:55:32 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -68,7 +69,7 @@
     {
         if (_target != null) return _target;
         ValueBinding vb = getValueBinding("target");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)
@@ -80,7 +81,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -92,7 +93,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlGraphicImage.java Fri Dec  2 02:55:32 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -62,7 +63,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -74,7 +75,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputSecret.java Fri Dec  2 02:55:32 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -68,7 +69,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -80,7 +81,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnly(boolean displayValueOnly)
@@ -114,7 +115,7 @@
     {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
@@ -126,7 +127,7 @@
     {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputText.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputText.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputText.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputText.java Fri Dec  2 02:55:32 2005
@@ -19,6 +19,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -70,7 +71,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -82,7 +83,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isRendered()
@@ -120,7 +121,7 @@
     {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 	
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass)
@@ -132,7 +133,7 @@
     {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public Object saveState(FacesContext context)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlInputTextarea.java Fri Dec  2 02:55:32 2005
@@ -15,10 +15,11 @@
  */
 package org.apache.myfaces.component.html.ext;
 
+import org.apache.myfaces.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -68,7 +69,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -80,7 +81,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 
@@ -135,7 +136,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -145,7 +146,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlMessages.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlMessages.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlMessages.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlMessages.java Fri Dec  2 02:55:32 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -69,7 +70,7 @@
     {
         if (_summaryFormat != null) return _summaryFormat;
         ValueBinding vb = getValueBinding("summaryFormat");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setGlobalSummaryFormat(String globalSummaryFormat)
@@ -81,7 +82,7 @@
     {
         if (_globalSummaryFormat != null) return _globalSummaryFormat;
         ValueBinding vb = getValueBinding("globalSummaryFormat");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDetailFormat(String detailFormat)
@@ -93,7 +94,7 @@
     {
         if (_detailFormat != null) return _detailFormat;
         ValueBinding vb = getValueBinding("detailFormat");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)
@@ -105,7 +106,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -117,7 +118,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setReplaceIdWithLabel(boolean replaceIdWithLabel)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputLabel.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputLabel.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputLabel.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputLabel.java Fri Dec  2 02:55:32 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -63,7 +64,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -75,7 +76,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputText.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputText.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputText.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlOutputText.java Fri Dec  2 02:55:32 2005
@@ -18,6 +18,7 @@
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -62,7 +63,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -74,7 +75,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGrid.java Fri Dec  2 02:55:32 2005
@@ -15,10 +15,11 @@
  */
 package org.apache.myfaces.component.html.ext;
 
+import org.apache.myfaces.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -69,7 +70,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -81,7 +82,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -105,7 +106,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -115,7 +116,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGroup.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGroup.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGroup.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlPanelGroup.java Fri Dec  2 02:55:32 2005
@@ -15,10 +15,11 @@
  */
 package org.apache.myfaces.component.html.ext;
 
+import org.apache.myfaces.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -69,7 +70,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -81,7 +82,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -105,7 +106,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -115,7 +116,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

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=351675&r1=351674&r2=351675&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 Fri Dec  2 02:55:32 2005
@@ -15,11 +15,12 @@
  */
 package org.apache.myfaces.component.html.ext;
 
-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.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -72,7 +73,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -84,7 +85,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -108,7 +109,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -118,7 +119,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

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=351675&r1=351674&r2=351675&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 Fri Dec  2 02:55:32 2005
@@ -15,12 +15,13 @@
  */
 package org.apache.myfaces.component.html.ext;
 
-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.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
 import org.apache.myfaces.custom.ExtendedComponentBase;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -72,7 +73,7 @@
     {
         if (_layoutWidth != null) return _layoutWidth;
         ValueBinding vb = getValueBinding("layoutWidth");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)
@@ -84,7 +85,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -96,7 +97,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -120,7 +121,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -130,7 +131,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

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=351675&r1=351674&r2=351675&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 Fri Dec  2 02:55:32 2005
@@ -15,11 +15,12 @@
  */
 package org.apache.myfaces.component.html.ext;
 
-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.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -68,7 +69,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -80,7 +81,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -104,7 +105,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -114,7 +115,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

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=351675&r1=351674&r2=351675&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 Fri Dec  2 02:55:32 2005
@@ -15,11 +15,12 @@
  */
 package org.apache.myfaces.component.html.ext;
 
-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.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -68,7 +69,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -80,7 +81,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -104,7 +105,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -114,7 +115,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

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=351675&r1=351674&r2=351675&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 Fri Dec  2 02:55:32 2005
@@ -15,11 +15,12 @@
  */
 package org.apache.myfaces.component.html.ext;
 
-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.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -68,7 +69,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -80,7 +81,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -104,7 +105,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -114,7 +115,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

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=351675&r1=351674&r2=351675&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 Fri Dec  2 02:55:32 2005
@@ -15,11 +15,12 @@
  */
 package org.apache.myfaces.component.html.ext;
 
-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.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -68,7 +69,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -80,7 +81,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -104,7 +105,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -114,7 +115,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

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=351675&r1=351674&r2=351675&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 Fri Dec  2 02:55:32 2005
@@ -17,6 +17,14 @@
 
 import java.util.Iterator;
 
+import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.component.EscapeCapable;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.util._ComponentUtils;
+
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
@@ -26,14 +34,6 @@
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
-
-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;
-
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
@@ -182,7 +182,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -194,7 +194,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isSetDisplayValueOnly() {
@@ -218,7 +218,7 @@
     public String getDisplayValueOnlyStyle() {
         if (_displayValueOnlyStyle != null) return _displayValueOnlyStyle;
         ValueBinding vb = getValueBinding("displayValueOnlyStyle");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyle(String displayValueOnlyStyle) {
@@ -228,7 +228,7 @@
     public String getDisplayValueOnlyStyleClass() {
         if (_displayValueOnlyStyleClass != null) return _displayValueOnlyStyleClass;
         ValueBinding vb = getValueBinding("displayValueOnlyStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDisplayValueOnlyStyleClass(String displayValueOnlyStyleClass) {

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/aliasbean/AliasBean.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/aliasbean/AliasBean.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/aliasbean/AliasBean.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/aliasbean/AliasBean.java Fri Dec  2 02:55:32 2005
@@ -21,6 +21,10 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.util._ComponentUtils;
+
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;
 import javax.faces.context.FacesContext;
@@ -28,9 +32,6 @@
 import javax.faces.event.AbortProcessingException;
 import javax.faces.event.FacesEvent;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * The aliasBean tag allows you to create a temporary name for a real bean.
  * The temporary name exists (is visible) only to the children of the aliasBean.
@@ -90,7 +91,7 @@
         if (valueExpression != null)
             return valueExpression;
         ValueBinding vb = getValueBinding("value");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setValue(String valueExpression){

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java Fri Dec  2 02:55:32 2005
@@ -16,6 +16,7 @@
 package org.apache.myfaces.custom.calendar;
 
 import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util._ComponentUtils;
 
 import javax.faces.component.html.HtmlInputText;
 import javax.faces.context.FacesContext;
@@ -69,7 +70,7 @@
     {
         if (_monthYearRowClass != null) return _monthYearRowClass;
         ValueBinding vb = getValueBinding("monthYearRowClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setWeekRowClass(String weekRowClass)
@@ -81,7 +82,7 @@
     {
         if (_weekRowClass != null) return _weekRowClass;
         ValueBinding vb = getValueBinding("weekRowClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setDayCellClass(String dayCellClass)
@@ -93,7 +94,7 @@
     {
         if (_dayCellClass != null) return _dayCellClass;
         ValueBinding vb = getValueBinding("dayCellClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setCurrentDayCellClass(String currentDayCellClass)
@@ -105,7 +106,7 @@
     {
         if (_currentDayCellClass != null) return _currentDayCellClass;
         ValueBinding vb = getValueBinding("currentDayCellClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setRenderAsPopup(boolean renderAsPopup)
@@ -148,7 +149,7 @@
     {
         if (_popupButtonString != null) return _popupButtonString;
         ValueBinding vb = getValueBinding("popupButtonString");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
     
     public void setRenderPopupButtonAsImage(boolean renderPopupButtonAsImage)
@@ -173,7 +174,7 @@
     {
         if (_popupDateFormat != null) return _popupDateFormat;
         ValueBinding vb = getValueBinding("popupDateFormat");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)
@@ -185,7 +186,7 @@
     {
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole)
@@ -197,7 +198,7 @@
     {
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupGotoString(String popupGotoString)
@@ -209,7 +210,7 @@
     {
         if (_popupGotoString != null) return _popupGotoString;
         ValueBinding vb = getValueBinding("popupGotoString");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupTodayString(String popupTodayString)
@@ -221,7 +222,7 @@
     {
         if (_popupTodayString != null) return _popupTodayString;
         ValueBinding vb = getValueBinding("popupTodayString");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupWeekString(String popupWeekString)
@@ -233,7 +234,7 @@
     {
         if (_popupWeekString != null) return _popupWeekString;
         ValueBinding vb = getValueBinding("popupWeekString");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupScrollLeftMessage(String popupScrollLeftMessage)
@@ -245,7 +246,7 @@
     {
         if (_popupScrollLeftMessage != null) return _popupScrollLeftMessage;
         ValueBinding vb = getValueBinding("popupScrollLeftMessage");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupScrollRightMessage(String popupScrollRightMessage)
@@ -257,7 +258,7 @@
     {
         if (_popupScrollRightMessage != null) return _popupScrollRightMessage;
         ValueBinding vb = getValueBinding("popupScrollRightMessage");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupSelectMonthMessage(String popupSelectMonthMessage)
@@ -269,7 +270,7 @@
     {
         if (_popupSelectMonthMessage != null) return _popupSelectMonthMessage;
         ValueBinding vb = getValueBinding("popupSelectMonthMessage");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupSelectYearMessage(String popupSelectYearMessage)
@@ -281,7 +282,7 @@
     {
         if (_popupSelectYearMessage != null) return _popupSelectYearMessage;
         ValueBinding vb = getValueBinding("popupSelectYearMessage");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPopupSelectDateMessage(String popupSelectDateMessage)
@@ -293,7 +294,7 @@
     {
         if (_popupSelectDateMessage != null) return _popupSelectDateMessage;
         ValueBinding vb = getValueBinding("popupSelectDateMessage");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/checkbox/HtmlCheckbox.java Fri Dec  2 02:55:32 2005
@@ -15,6 +15,8 @@
  */
 package org.apache.myfaces.custom.checkbox;
 
+import org.apache.myfaces.util._ComponentUtils;
+
 import javax.faces.component.UIComponentBase;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -60,7 +62,7 @@
     {
         if (_for != null) return _for;
         ValueBinding vb = getValueBinding("for");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setIndex(int index)

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/collapsiblepanel/HtmlCollapsiblePanel.java Fri Dec  2 02:55:32 2005
@@ -15,12 +15,15 @@
  */
 package org.apache.myfaces.custom.collapsiblepanel;
 
+import java.io.IOException;
+import java.util.Iterator;
+
+import org.apache.myfaces.util._ComponentUtils;
+
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
-import java.io.IOException;
-import java.util.Iterator;
 
 /**
  * @author Kalle Korhonen (latest modification by $Author$)
@@ -199,7 +202,7 @@
     {
         if (_title != null) return _title;
         ValueBinding vb = getValueBinding("title");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setTitle(String title)
@@ -211,7 +214,7 @@
     {
         if (_style != null) return _style;
         ValueBinding vb = getValueBinding("style");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setStyle(String style)
@@ -223,7 +226,7 @@
     {
         if (_styleClass != null) return _styleClass;
         ValueBinding vb = getValueBinding("styleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setStyleClass(String styleClass)
@@ -240,7 +243,7 @@
     {
         if (_var != null) return _var;
         ValueBinding vb = getValueBinding("var");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setTitleVar(String titleVar)
@@ -252,7 +255,7 @@
     {
         if (_titleVar != null) return _titleVar;
         ValueBinding vb = getValueBinding("titleVar");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     //------------------ GENERATED CODE END ---------------------------------------

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datalist/HtmlDataList.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datalist/HtmlDataList.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datalist/HtmlDataList.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/datalist/HtmlDataList.java Fri Dec  2 02:55:32 2005
@@ -15,15 +15,14 @@
  */
 package org.apache.myfaces.custom.datalist;
 
-import java.util.Iterator;
 import java.util.Map;
 
-import javax.faces.component.UIComponent;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
+
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
@@ -129,7 +128,7 @@
     {
         if (_layout != null) return _layout;
         ValueBinding vb = getValueBinding("layout");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setRowIndexVar(String rowIndexVar)
@@ -141,7 +140,7 @@
     {
         if (_rowIndexVar != null) return _rowIndexVar;
         ValueBinding vb = getValueBinding("rowIndexVar");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setRowCountVar(String rowCountVar)
@@ -153,7 +152,7 @@
     {
         if (_rowCountVar != null) return _rowCountVar;
         ValueBinding vb = getValueBinding("rowCountVar");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnclick(String onclick)
@@ -165,7 +164,7 @@
     {
         if (_onclick != null) return _onclick;
         ValueBinding vb = getValueBinding("onclick");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOndblclick(String ondblclick)
@@ -177,7 +176,7 @@
     {
         if (_ondblclick != null) return _ondblclick;
         ValueBinding vb = getValueBinding("ondblclick");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnkeydown(String onkeydown)
@@ -189,7 +188,7 @@
     {
         if (_onkeydown != null) return _onkeydown;
         ValueBinding vb = getValueBinding("onkeydown");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnkeypress(String onkeypress)
@@ -201,7 +200,7 @@
     {
         if (_onkeypress != null) return _onkeypress;
         ValueBinding vb = getValueBinding("onkeypress");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnkeyup(String onkeyup)
@@ -213,7 +212,7 @@
     {
         if (_onkeyup != null) return _onkeyup;
         ValueBinding vb = getValueBinding("onkeyup");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmousedown(String onmousedown)
@@ -225,7 +224,7 @@
     {
         if (_onmousedown != null) return _onmousedown;
         ValueBinding vb = getValueBinding("onmousedown");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmousemove(String onmousemove)
@@ -237,7 +236,7 @@
     {
         if (_onmousemove != null) return _onmousemove;
         ValueBinding vb = getValueBinding("onmousemove");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmouseout(String onmouseout)
@@ -249,7 +248,7 @@
     {
         if (_onmouseout != null) return _onmouseout;
         ValueBinding vb = getValueBinding("onmouseout");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmouseover(String onmouseover)
@@ -261,7 +260,7 @@
     {
         if (_onmouseover != null) return _onmouseover;
         ValueBinding vb = getValueBinding("onmouseover");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setOnmouseup(String onmouseup)
@@ -273,7 +272,7 @@
     {
         if (_onmouseup != null) return _onmouseup;
         ValueBinding vb = getValueBinding("onmouseup");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setStyle(String style)
@@ -285,7 +284,7 @@
     {
         if (_style != null) return _style;
         ValueBinding vb = getValueBinding("style");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setStyleClass(String styleClass)
@@ -297,7 +296,7 @@
     {
         if (_styleClass != null) return _styleClass;
         ValueBinding vb = getValueBinding("styleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
     
     public void setItemStyleClass(String itemStyleClass)
@@ -309,7 +308,7 @@
     {
         if (_itemStyleClass != null) return _itemStyleClass;
         ValueBinding vb = getValueBinding("itemStyleClass");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
     
     public void setTitle(String title)
@@ -321,7 +320,7 @@
     {
         if (_title != null) return _title;
         ValueBinding vb = getValueBinding("title");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlInputDate.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlInputDate.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlInputDate.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlInputDate.java Fri Dec  2 02:55:32 2005
@@ -22,13 +22,14 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util._ComponentUtils;
+
 import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-
 /**
  * @author Sylvain Vieujot (latest modification by $Author$)
  * @version $Revision$ $Date$
@@ -67,7 +68,7 @@
 	public String getType() {
 		if (_type != null) return _type;
 		ValueBinding vb = getValueBinding("type");
-		return vb != null ? (String)vb.getValue(getFacesContext()) : "date";
+		return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : "date";
 	}
 	public void setType(String string) {
 		_type = string;
@@ -96,7 +97,7 @@
     public String getTimeZone(){
         if(_timeZone != null) return _timeZone;
         ValueBinding vb = getValueBinding("timeZone");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
     
     public void setTimeZone(String timeZone){
@@ -119,7 +120,7 @@
     public String getEnabledOnUserRole(){
         if (_enabledOnUserRole != null) return _enabledOnUserRole;
         ValueBinding vb = getValueBinding("enabledOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setVisibleOnUserRole(String visibleOnUserRole){
@@ -128,7 +129,7 @@
     public String getVisibleOnUserRole(){
         if (_visibleOnUserRole != null) return _visibleOnUserRole;
         ValueBinding vb = getValueBinding("visibleOnUserRole");
-        return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public boolean isRendered(){



Mime
View raw message