You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2005/12/02 11:56:31 UTC
svn commit: r351675 [4/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...
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/fileupload/HtmlInputFileUpload.java Fri Dec 2 02:55:32 2005
@@ -15,15 +15,16 @@
*/
package org.apache.myfaces.custom.fileupload;
+import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.html.HtmlInputText;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.util.MessageUtils;
-
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -60,7 +61,7 @@
public String getStorage() {
if (_storage != null) return _storage;
ValueBinding vb = getValueBinding("storage");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
@@ -77,7 +78,7 @@
{
if (_accept != null) return _accept;
ValueBinding vb = getValueBinding("accept");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setEnabledOnUserRole(String enabledOnUserRole)
@@ -89,7 +90,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)
@@ -101,7 +102,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/custom/htmlTag/HtmlTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/htmlTag/HtmlTag.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/htmlTag/HtmlTag.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/htmlTag/HtmlTag.java Fri Dec 2 02:55:32 2005
@@ -15,13 +15,14 @@
*/
package org.apache.myfaces.custom.htmlTag;
-import javax.faces.component.UIOutput;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
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.component.UIOutput;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* @author bdudney (latest modification by $Author$)
@@ -116,7 +117,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)
@@ -128,7 +129,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()
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputHtml/InputHtml.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputHtml/InputHtml.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputHtml/InputHtml.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputHtml/InputHtml.java Fri Dec 2 02:55:32 2005
@@ -15,13 +15,14 @@
*/
package org.apache.myfaces.custom.inputHtml;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.component.html.ext.HtmlInputText;
import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.util._ComponentUtils;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* HTML Editor using the kupu library.
@@ -127,7 +128,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){
this._style = style;
@@ -137,7 +138,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){
this._styleClass = styleClass;
@@ -157,7 +158,7 @@
if (_type != null)
return _type;
ValueBinding vb = getValueBinding("type");
- return vb != null ? (String)vb.getValue(getFacesContext()) : "fragment";
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : "fragment";
}
public void setType(String _type){
this._type = _type;
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java Fri Dec 2 02:55:32 2005
@@ -15,11 +15,12 @@
*/
package org.apache.myfaces.custom.inputTextHelp;
-import org.apache.myfaces.component.html.util.HtmlComponentUtils;
import org.apache.myfaces.component.html.ext.HtmlInputText;
+import org.apache.myfaces.component.html.util.HtmlComponentUtils;
+import org.apache.myfaces.util._ComponentUtils;
-import javax.faces.el.ValueBinding;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* @author Thomas Obereder
@@ -53,7 +54,7 @@
{
if(_helpText != null) return _helpText;
ValueBinding vb = getValueBinding("helpText");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setHelpText(String helpText)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java Fri Dec 2 02:55:32 2005
@@ -3,6 +3,8 @@
*/
package org.apache.myfaces.custom.jslistener;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
@@ -43,7 +45,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 setExpressionValue(String expressionValue)
@@ -55,7 +57,7 @@
{
if (_expressionValue != null) return _expressionValue;
ValueBinding vb = getValueBinding("expressionValue");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setProperty(String property)
@@ -67,14 +69,14 @@
{
if (_property != null) return _property;
ValueBinding vb = getValueBinding("property");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public String getBodyTagEvent()
{
if (_bodyTagEvent != null) return _bodyTagEvent;
ValueBinding vb = getValueBinding("bodyTagEvent");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setBodyTagEvent(String bodyTagEvent)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java Fri Dec 2 02:55:32 2005
@@ -4,10 +4,11 @@
package org.apache.myfaces.custom.jsvalueset;
import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util._ComponentUtils;
import javax.faces.component.UIOutput;
-import javax.faces.el.ValueBinding;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* @author Martin Marinschek (latest modification by $Author$)
@@ -44,7 +45,7 @@
{
if (_name != null) return _name;
ValueBinding vb = getValueBinding("name");
- 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/layout/HtmlPanelLayout.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java Fri Dec 2 02:55:32 2005
@@ -15,6 +15,8 @@
*/
package org.apache.myfaces.custom.layout;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlPanelGroup;
import javax.faces.context.FacesContext;
@@ -90,7 +92,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 setHeaderClass(String headerClass)
@@ -102,7 +104,7 @@
{
if (_headerClass != null) return _headerClass;
ValueBinding vb = getValueBinding("headerClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setNavigationClass(String navigationClass)
@@ -114,7 +116,7 @@
{
if (_navigationClass != null) return _navigationClass;
ValueBinding vb = getValueBinding("navigationClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setBodyClass(String bodyClass)
@@ -126,7 +128,7 @@
{
if (_bodyClass != null) return _bodyClass;
ValueBinding vb = getValueBinding("bodyClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setFooterClass(String footerClass)
@@ -138,7 +140,7 @@
{
if (_footerClass != null) return _footerClass;
ValueBinding vb = getValueBinding("footerClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setHeaderStyle(String headerStyle)
@@ -150,7 +152,7 @@
{
if (_headerStyle != null) return _headerStyle;
ValueBinding vb = getValueBinding("headerStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setNavigationStyle(String navigationStyle)
@@ -162,7 +164,7 @@
{
if (_navigationStyle != null) return _navigationStyle;
ValueBinding vb = getValueBinding("navigationStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setBodyStyle(String bodyStyle)
@@ -174,7 +176,7 @@
{
if (_bodyStyle != null) return _bodyStyle;
ValueBinding vb = getValueBinding("bodyStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setFooterStyle(String footerStyle)
@@ -186,7 +188,7 @@
{
if (_footerStyle != null) return _footerStyle;
ValueBinding vb = getValueBinding("footerStyle");
- 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/navigation/HtmlPanelNavigation.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java Fri Dec 2 02:55:32 2005
@@ -15,18 +15,19 @@
*/
package org.apache.myfaces.custom.navigation;
-import org.apache.myfaces.component.html.ext.HtmlPanelGroup;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.component.html.ext.HtmlPanelGroup;
+import org.apache.myfaces.util._ComponentUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
/**
* Panel, that includes navigation items ({@link HtmlCommandNavigation}) and other
@@ -133,7 +134,7 @@
{
if (_itemClass != null) return _itemClass;
ValueBinding vb = getValueBinding("itemClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setOpenItemClass(String openItemClass)
@@ -145,7 +146,7 @@
{
if (_openItemClass != null) return _openItemClass;
ValueBinding vb = getValueBinding("openItemClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setActiveItemClass(String activeItemClass)
@@ -157,7 +158,7 @@
{
if (_activeItemClass != null) return _activeItemClass;
ValueBinding vb = getValueBinding("activeItemClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setSeparatorClass(String separatorClass)
@@ -169,7 +170,7 @@
{
if (_separatorClass != null) return _separatorClass;
ValueBinding vb = getValueBinding("separatorClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setItemStyle(String itemStyle)
@@ -181,7 +182,7 @@
{
if (_itemStyle != null) return _itemStyle;
ValueBinding vb = getValueBinding("itemStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setOpenItemStyle(String openItemStyle)
@@ -193,7 +194,7 @@
{
if (_openItemStyle != null) return _openItemStyle;
ValueBinding vb = getValueBinding("openItemStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setActiveItemStyle(String activeItemStyle)
@@ -205,7 +206,7 @@
{
if (_activeItemStyle != null) return _activeItemStyle;
ValueBinding vb = getValueBinding("activeItemStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setSeparatorStyle(String separatorStyle)
@@ -217,7 +218,7 @@
{
if (_separatorStyle != null) return _separatorStyle;
ValueBinding vb = getValueBinding("separatorStyle");
- 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/navmenu/UINavigationMenuItem.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java Fri Dec 2 02:55:32 2005
@@ -15,14 +15,15 @@
*/
package org.apache.myfaces.custom.navmenu;
-import org.apache.myfaces.component.UserRoleUtils;
import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util._ComponentUtils;
-import javax.faces.component.UISelectItem;
import javax.faces.component.ActionSource;
-import javax.faces.el.ValueBinding;
-import javax.faces.el.MethodBinding;
+import javax.faces.component.UISelectItem;
import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
import javax.faces.event.ActionListener;
/**
@@ -65,7 +66,7 @@
{
if (_icon != null) return _icon;
ValueBinding vb = getValueBinding("icon");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setSplit(boolean split)
@@ -167,7 +168,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)
@@ -179,7 +180,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()
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java Fri Dec 2 02:55:32 2005
@@ -15,18 +15,20 @@
*/
package org.apache.myfaces.custom.navmenu.htmlnavmenu;
-import org.apache.myfaces.component.html.ext.HtmlPanelGroup;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.component.html.ext.HtmlPanelGroup;
+import org.apache.myfaces.util._ComponentUtils;
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIViewRoot;
-import javax.faces.component.UIComponent;
import javax.faces.component.NamingContainer;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import java.io.IOException;
-import java.util.List;
-import java.util.Iterator;
/**
* Many thanks to the guys from Swiss Federal Institute of Intellectual Property & Marc Bouquet
@@ -131,7 +133,7 @@
{
if (_itemClass != null) return _itemClass;
ValueBinding vb = getValueBinding("itemClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setOpenItemClass(String openItemClass)
@@ -143,7 +145,7 @@
{
if (_openItemClass != null) return _openItemClass;
ValueBinding vb = getValueBinding("openItemClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setActiveItemClass(String activeItemClass)
@@ -155,7 +157,7 @@
{
if (_activeItemClass != null) return _activeItemClass;
ValueBinding vb = getValueBinding("activeItemClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setSeparatorClass(String separatorClass)
@@ -167,7 +169,7 @@
{
if (_separatorClass != null) return _separatorClass;
ValueBinding vb = getValueBinding("separatorClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setItemStyle(String itemStyle)
@@ -179,7 +181,7 @@
{
if (_itemStyle != null) return _itemStyle;
ValueBinding vb = getValueBinding("itemStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setOpenItemStyle(String openItemStyle)
@@ -191,7 +193,7 @@
{
if (_openItemStyle != null) return _openItemStyle;
ValueBinding vb = getValueBinding("openItemStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setActiveItemStyle(String activeItemStyle)
@@ -203,7 +205,7 @@
{
if (_activeItemStyle != null) return _activeItemStyle;
ValueBinding vb = getValueBinding("activeItemStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setSeparatorStyle(String separatorStyle)
@@ -215,14 +217,14 @@
{
if (_separatorStyle != null) return _separatorStyle;
ValueBinding vb = getValueBinding("separatorStyle");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public String getLayout()
{
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 setLayout(String layout)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java Fri Dec 2 02:55:32 2005
@@ -15,12 +15,13 @@
*/
package org.apache.myfaces.custom.navmenu.jscookmenu;
-import org.apache.myfaces.component.UserRoleUtils;
import org.apache.myfaces.component.UserRoleAware;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util._ComponentUtils;
import javax.faces.component.UICommand;
-import javax.faces.el.ValueBinding;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* @author Thomas Spiegl (latest modification by $Author$)
@@ -65,7 +66,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 setTheme(String theme)
@@ -77,7 +78,7 @@
{
if (_theme != null) return _theme;
ValueBinding vb = getValueBinding("theme");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setEnabledOnUserRole(String enabledOnUserRole)
@@ -89,7 +90,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)
@@ -101,7 +102,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()
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java Fri Dec 2 02:55:32 2005
@@ -15,9 +15,10 @@
*/
package org.apache.myfaces.custom.panelstack;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.component.html.HtmlPanelGroup;
import javax.faces.context.FacesContext;
-
import javax.faces.el.ValueBinding;
@@ -57,7 +58,7 @@
{
if (selectedPanel != null) return selectedPanel;
ValueBinding vb = getValueBinding("selectedPanel");
- 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/custom/popup/HtmlPopup.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopup.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopup.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/popup/HtmlPopup.java Fri Dec 2 02:55:32 2005
@@ -15,10 +15,12 @@
*/
package org.apache.myfaces.custom.popup;
-import javax.faces.component.UIComponentBase;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.component.UIComponent;
-import javax.faces.el.ValueBinding;
+import javax.faces.component.UIComponentBase;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* @author Martin Marinschek (latest modification by $Author$)
@@ -79,7 +81,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)
@@ -91,7 +93,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 setDisplayAtDistanceX(Integer displayAtDistanceX)
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/radio/HtmlRadio.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/radio/HtmlRadio.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/radio/HtmlRadio.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/radio/HtmlRadio.java Fri Dec 2 02:55:32 2005
@@ -15,6 +15,8 @@
*/
package org.apache.myfaces.custom.radio;
+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/stylesheet/Stylesheet.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java Fri Dec 2 02:55:32 2005
@@ -15,13 +15,14 @@
*/
package org.apache.myfaces.custom.stylesheet;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.component.UIOutput;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* @author mwessendorf (latest modification by $Author$)
@@ -59,7 +60,7 @@
if (_path != null) return _path;
ValueBinding vb = getValueBinding("path");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setPath(String path) {
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java Fri Dec 2 02:55:32 2005
@@ -16,10 +16,11 @@
package org.apache.myfaces.custom.swapimage;
import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util._ComponentUtils;
import javax.faces.component.UIGraphic;
-import javax.faces.el.ValueBinding;
import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
/**
* @author Thomas Spiegl
@@ -73,7 +74,7 @@
{
if (_swapImageUrl != null) return _swapImageUrl;
ValueBinding vb = getValueBinding("swapImageUrl");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setActiveImageUrl(String activeImageUrl)
@@ -85,7 +86,7 @@
{
if (_activeImageUrl != null) return _activeImageUrl;
ValueBinding vb = getValueBinding("activeImageUrl");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setAlt(String alt)
@@ -97,7 +98,7 @@
{
if (_alt != null) return _alt;
ValueBinding vb = getValueBinding("alt");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setDir(String dir)
@@ -109,7 +110,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 setHeight(String height)
@@ -121,7 +122,7 @@
{
if (_height != null) return _height;
ValueBinding vb = getValueBinding("height");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setIsmap(boolean ismap)
@@ -146,7 +147,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 setLongdesc(String longdesc)
@@ -158,7 +159,7 @@
{
if (_longdesc != null) return _longdesc;
ValueBinding vb = getValueBinding("longdesc");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setOnclick(String onclick)
@@ -170,7 +171,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)
@@ -182,7 +183,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)
@@ -194,7 +195,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)
@@ -206,7 +207,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)
@@ -218,7 +219,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 setStyle(String style)
@@ -230,7 +231,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)
@@ -242,7 +243,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 setTitle(String title)
@@ -254,7 +255,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 setUsemap(String usemap)
@@ -266,7 +267,7 @@
{
if (_usemap != null) return _usemap;
ValueBinding vb = getValueBinding("usemap");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setWidth(String width)
@@ -278,7 +279,7 @@
{
if (_width != null) return _width;
ValueBinding vb = getValueBinding("width");
- 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/tabbedpane/HtmlPanelTab.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTab.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTab.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTab.java Fri Dec 2 02:55:32 2005
@@ -15,12 +15,13 @@
*/
package org.apache.myfaces.custom.tabbedpane;
+import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.component.html.HtmlPanelGroup;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
-import org.apache.myfaces.component.UserRoleUtils;
-
/**
* @author Manfred Geiler (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -58,7 +59,7 @@
{
if (_label != null) return _label;
ValueBinding vb = getValueBinding("label");
- 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/tabbedpane/HtmlPanelTabbedPane.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java?rev=351675&r1=351674&r2=351675&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java Fri Dec 2 02:55:32 2005
@@ -18,6 +18,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.myfaces.util._ComponentUtils;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.component.UINamingContainer;
@@ -181,7 +183,7 @@
{
if (_bgcolor != null) return _bgcolor;
ValueBinding vb = getValueBinding("bgcolor");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setActiveTabStyleClass(String activeTabStyleClass)
@@ -193,7 +195,7 @@
{
if (_activeTabStyleClass != null) return _activeTabStyleClass;
ValueBinding vb = getValueBinding("activeTabStyleClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setInactiveTabStyleClass(String inactiveTabStyleClass)
@@ -205,7 +207,7 @@
{
if (_inactiveTabStyleClass != null) return _inactiveTabStyleClass;
ValueBinding vb = getValueBinding("inactiveTabStyleClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setActiveSubStyleClass(String activeSubStyleClass)
@@ -217,7 +219,7 @@
{
if (_activeSubStyleClass != null) return _activeSubStyleClass;
ValueBinding vb = getValueBinding("activeSubStyleClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setInactiveSubStyleClass(String inactiveSubStyleClass)
@@ -229,7 +231,7 @@
{
if (_inactiveSubStyleClass != null) return _inactiveSubStyleClass;
ValueBinding vb = getValueBinding("inactiveSubStyleClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
public void setTabContentStyleClass(String tabContentStyleClass)
@@ -241,7 +243,7 @@
{
if (_tabContentStyleClass != null) return _tabContentStyleClass;
ValueBinding vb = getValueBinding("tabContentStyleClass");
- return vb != null ? (String)vb.getValue(getFacesContext()) : null;
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}