You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2006/06/22 21:28:04 UTC
svn commit: r416448 - in /myfaces:
shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/
tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/
tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/
Author: imario
Date: Thu Jun 22 12:28:03 2006
New Revision: 416448
URL: http://svn.apache.org/viewvc?rev=416448&view=rev
Log:
TOMAHAWK-176 now copy the forceId attribute too
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=416448&r1=416447&r2=416448&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Thu Jun 22 12:28:03 2006
@@ -706,9 +706,38 @@
return null;
}
+ public static boolean getBooleanValue(String attribute, Object value, boolean defaultValue)
+ {
+ if(value instanceof Boolean)
+ {
+ return ((Boolean) value).booleanValue();
+ }
+ else if(value instanceof String)
+ {
+ return Boolean.valueOf((String) value).booleanValue();
+ }
+ else if(value != null)
+ {
+ log.error("value for attribute "+attribute+
+ " must be instanceof 'Boolean' or 'String', is of type : "+value.getClass());
+
+ return defaultValue;
+ }
+
+ return defaultValue;
+ }
+
public static void copyHtmlInputTextAttributes(HtmlInputText src, HtmlInputText dest)
{
dest.setId(src.getId());
+ boolean forceId = getBooleanValue(
+ JSFAttr.FORCE_ID_ATTR,
+ src.getAttributes().get(JSFAttr.FORCE_ID_ATTR),
+ false);
+ if (forceId)
+ {
+ dest.getAttributes().put(JSFAttr.FORCE_ID_ATTR, Boolean.TRUE);
+ }
dest.setImmediate(src.isImmediate());
dest.setTransient(src.isTransient());
dest.setAccesskey(src.getAccesskey());
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java?rev=416448&r1=416447&r2=416448&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/util/HtmlComponentUtils.java Thu Jun 22 12:28:03 2006
@@ -22,6 +22,7 @@
import javax.faces.render.Renderer;
import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
+import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,7 +60,7 @@
{
//forceId enabled?
- boolean forceId = getBooleanValue(JSFAttr.FORCE_ID_ATTR,
+ boolean forceId = RendererUtils.getBooleanValue(JSFAttr.FORCE_ID_ATTR,
component.getAttributes().get(JSFAttr.FORCE_ID_ATTR),false);
if (forceId && component.getId() != null)
@@ -75,7 +76,7 @@
if (parentContainer instanceof UIData)
{
// see if the originally supplied id should be used
- boolean forceIdIndex = getBooleanValue(JSFAttr.FORCE_ID_ATTR,
+ boolean forceIdIndex = RendererUtils.getBooleanValue(JSFAttr.FORCE_ID_ATTR,
component.getAttributes().get(JSFAttr.FORCE_ID_INDEX_ATTR),true);
// note: user may have specifically requested that we do not add the special forceId [index] suffix
@@ -101,27 +102,6 @@
{
return null;
}
- }
-
- public static boolean getBooleanValue(String attribute, Object value, boolean defaultValue)
- {
- if(value instanceof Boolean)
- {
- return ((Boolean) value).booleanValue();
- }
- else if(value instanceof String)
- {
- return Boolean.valueOf((String) value).booleanValue();
- }
- else if(value != null)
- {
- log.error("value for attribute "+attribute+
- " must be instanceof 'Boolean' or 'String', is of type : "+value.getClass());
-
- return defaultValue;
- }
-
- return defaultValue;
}
/**
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=416448&r1=416447&r2=416448&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Thu Jun 22 12:28:03 2006
@@ -282,15 +282,6 @@
if(inputText == null)
{
inputText = (HtmlInputTextHelp) application.createComponent(HtmlInputTextHelp.COMPONENT_TYPE);
-
- boolean forceId = HtmlComponentUtils.getBooleanValue(
- JSFAttr.FORCE_ID_ATTR,
- inputCalendar.getAttributes().get(JSFAttr.FORCE_ID_ATTR),
- false);
- if (forceId)
- {
- inputText.getAttributes().put(JSFAttr.FORCE_ID_ATTR, Boolean.TRUE);
- }
}
return inputText;
}