You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/01/12 03:08:00 UTC
svn commit: r1230370 [2/2] - in /myfaces/core/branches/2.0.x:
impl/src/main/java/org/apache/myfaces/renderkit/html/
shared/src/main/java/org/apache/myfaces/shared/renderkit/html/
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Thu Jan 12 02:07:58 2012
@@ -245,13 +245,39 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, component, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, component, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(component);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, component);
+ CommonPropertyUtils.renderFocusBlurEventProperties(writer,
+ commonPropertiesMarked, component);
+ }
+ else
+ {
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(component);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, component, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, component, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, component, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, component, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(component), component);
+ commonPropertiesMarked, component);
}
else
{
@@ -291,14 +317,29 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
- facesContext, writer, component, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, component, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(component);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventPropertiesWithoutOnclick(writer,
+ commonPropertiesMarked, component);
+ CommonPropertyUtils.renderFocusBlurEventProperties(writer,
+ commonPropertiesMarked, component);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
+ facesContext, writer, component, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, component, behaviors);
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutStyleAndEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(component), component);
+ commonPropertiesMarked, component);
}
else
{
@@ -369,7 +410,7 @@ public abstract class HtmlLinkRendererBa
UIComponent nestingForm = formInfo.getForm();
String formName = formInfo.getFormName();
- StringBuffer onClick = new StringBuffer();
+ StringBuilder onClick = new StringBuilder();
String commandOnclick;
if (component instanceof HtmlCommandLink)
@@ -401,7 +442,7 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.renderFormSubmitScript(facesContext);
- StringBuffer params = addChildParameters(facesContext, component, nestingForm);
+ StringBuilder params = addChildParameters(facesContext, component, nestingForm);
String target = getTarget(component);
@@ -545,7 +586,7 @@ public abstract class HtmlLinkRendererBa
UIComponent nestingForm = formInfo.getForm();
String formName = formInfo.getFormName();
- StringBuffer onClick = new StringBuffer();
+ StringBuilder onClick = new StringBuilder();
if (RendererUtils.isAdfOrTrinidadForm(formInfo.getForm()))
{
@@ -559,7 +600,7 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.renderFormSubmitScript(facesContext);
- StringBuffer params = addChildParameters(facesContext, component, nestingForm);
+ StringBuilder params = addChildParameters(facesContext, component, nestingForm);
String target = getTarget(component);
@@ -611,10 +652,10 @@ public abstract class HtmlLinkRendererBa
return target;
}
- private StringBuffer addChildParameters(FacesContext context, UIComponent component, UIComponent nestingForm)
+ private StringBuilder addChildParameters(FacesContext context, UIComponent component, UIComponent nestingForm)
{
//add child parameters
- StringBuffer params = new StringBuffer();
+ StringBuilder params = new StringBuilder();
params.append("[");
List<UIParameter> validParams = HtmlRendererUtils.getValidUIParameterChildren(
@@ -646,7 +687,7 @@ public abstract class HtmlLinkRendererBa
if (value != null)
{
strParamValue = value.toString();
- StringBuffer buff = null;
+ StringBuilder buff = null;
for (int i = 0; i < strParamValue.length(); i++)
{
char c = strParamValue.charAt(i);
@@ -654,7 +695,7 @@ public abstract class HtmlLinkRendererBa
{
if (buff == null)
{
- buff = new StringBuffer();
+ buff = new StringBuilder();
buff.append(strParamValue.substring(0,i));
}
buff.append('\\');
@@ -719,7 +760,7 @@ public abstract class HtmlLinkRendererBa
boolean strictXhtmlLinks
= MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isStrictXhtmlLinks();
- StringBuffer hrefBuf = new StringBuffer(path);
+ StringBuilder hrefBuf = new StringBuilder(path);
//add clientId parameter for decode
@@ -759,7 +800,7 @@ public abstract class HtmlLinkRendererBa
private void addChildParametersToHref(FacesContext facesContext,
UIComponent linkComponent,
- StringBuffer hrefBuf,
+ StringBuilder hrefBuf,
boolean firstParameter,
String charEncoding)
throws IOException
@@ -801,13 +842,40 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.writeIdIfNecessary(writer, output, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, output, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(output);
+ }
+
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, output);
+ CommonPropertyUtils.renderFocusBlurEventProperties(writer,
+ commonPropertiesMarked, output);
+ }
+ else
+ {
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(output);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(output), output);
+ commonPropertiesMarked, output);
}
else
{
@@ -846,7 +914,7 @@ public abstract class HtmlLinkRendererBa
}
if (getChildCount(output) > 0)
{
- StringBuffer hrefBuf = new StringBuffer(href);
+ StringBuilder hrefBuf = new StringBuilder(href);
addChildParametersToHref(facesContext, output, hrefBuf,
(href.indexOf('?') == -1), //first url parameter?
writer.getCharacterEncoding());
@@ -887,13 +955,39 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.writeIdAndNameIfNecessary(writer, output, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, output, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(output);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, output);
+ CommonPropertyUtils.renderFocusBlurEventProperties(writer,
+ commonPropertiesMarked, output);
+ }
+ else
+ {
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(output);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(output), output);
+ commonPropertiesMarked, output);
}
else
{
@@ -943,13 +1037,39 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.writeIdIfNecessary(writer, output, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, output, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(output);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, output);
+ CommonPropertyUtils.renderFocusBlurEventProperties(writer,
+ commonPropertiesMarked, output);
+ }
+ else
+ {
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(output);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(output), output);
+ commonPropertiesMarked, output);
}
else
{
@@ -995,13 +1115,39 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.writeIdAndNameIfNecessary(writer, output, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
- facesContext, writer, output, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(output);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, output);
+ CommonPropertyUtils.renderFocusBlurEventProperties(writer,
+ commonPropertiesMarked, output);
+ }
+ else
+ {
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(output);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, output, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(output), output);
+ commonPropertiesMarked, output);
}
else
{
@@ -1031,7 +1177,7 @@ public abstract class HtmlLinkRendererBa
private void renderLinkParameter(String name,
Object value,
- StringBuffer onClick,
+ StringBuilder onClick,
String jsForm,
UIComponent nestingForm)
{
@@ -1051,7 +1197,7 @@ public abstract class HtmlLinkRendererBa
private static void addParameterToHref(String name,
Object value,
- StringBuffer hrefBuf,
+ StringBuilder hrefBuf,
boolean firstParameter,
String charEncoding,
boolean strictXhtmlLinks) throws UnsupportedEncodingException
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java Thu Jan 12 02:07:58 2012
@@ -43,7 +43,7 @@ import java.util.Map;
* @version $Revision$ $Date$
*/
public class HtmlListboxRendererBase
- extends HtmlRenderer
+ extends HtmlSelectableRendererBase
{
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
throws IOException
@@ -69,14 +69,14 @@ public class HtmlListboxRendererBase
if (uiComponent instanceof UISelectMany)
{
- HtmlRendererUtils.renderListbox(facesContext,
+ renderListbox(facesContext,
(UISelectMany)uiComponent,
isDisabled(facesContext, uiComponent),
size, getConverter(facesContext, uiComponent));
}
else if (uiComponent instanceof HtmlSelectOneListbox)
{
- HtmlRendererUtils.renderListbox(facesContext,
+ renderListbox(facesContext,
(UISelectOne)uiComponent,
isDisabled(facesContext, uiComponent),
size, getConverter(facesContext, uiComponent));
@@ -86,6 +86,22 @@ public class HtmlListboxRendererBase
throw new IllegalArgumentException("Unsupported component class " + uiComponent.getClass().getName());
}
}
+
+ protected void renderListbox(FacesContext facesContext,
+ UISelectOne selectOne, boolean disabled, int size,
+ Converter converter) throws IOException
+ {
+ internalRenderSelect(facesContext, selectOne, disabled, size, false,
+ converter);
+ }
+
+ protected void renderListbox(FacesContext facesContext,
+ UISelectMany selectMany, boolean disabled, int size,
+ Converter converter) throws IOException
+ {
+ internalRenderSelect(facesContext, selectMany, disabled, size, true,
+ converter);
+ }
protected boolean isDisabled(FacesContext facesContext, UIComponent uiComponent)
{
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java Thu Jan 12 02:07:58 2012
@@ -44,7 +44,7 @@ import org.apache.myfaces.shared.renderk
* @version $Revision$ $Date$
*/
public class HtmlMenuRendererBase
- extends HtmlRenderer
+ extends HtmlSelectableRendererBase
{
//private static final Log log = LogFactory.getLog(HtmlMenuRenderer.class);
@@ -66,14 +66,14 @@ public class HtmlMenuRendererBase
if (component instanceof UISelectMany)
{
- HtmlRendererUtils.renderMenu(facesContext,
+ renderMenu(facesContext,
(UISelectMany)component,
isDisabled(facesContext, component),
getConverter(facesContext, component));
}
else if (component instanceof UISelectOne)
{
- HtmlRendererUtils.renderMenu(facesContext,
+ renderMenu(facesContext,
(UISelectOne)component,
isDisabled(facesContext, component),
getConverter(facesContext, component));
@@ -83,6 +83,22 @@ public class HtmlMenuRendererBase
throw new IllegalArgumentException("Unsupported component class " + component.getClass().getName());
}
}
+
+ protected void renderMenu(FacesContext facesContext,
+ UISelectOne selectOne, boolean disabled, Converter converter)
+ throws IOException
+ {
+ internalRenderSelect(facesContext, selectOne, disabled, 1, false,
+ converter);
+ }
+
+ protected void renderMenu(FacesContext facesContext,
+ UISelectMany selectMany, boolean disabled, Converter converter)
+ throws IOException
+ {
+ internalRenderSelect(facesContext, selectMany, disabled, 1, true,
+ converter);
+ }
protected boolean isDisabled(FacesContext facesContext, UIComponent uiComponent)
{
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Thu Jan 12 02:07:58 2012
@@ -109,8 +109,8 @@ public abstract class HtmlMessageRendere
ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HTML.SPAN_ELEM, null);
writer.writeAttribute(HTML.ID_ATTR, clientId + "_msgFor", null);
- HtmlRendererUtils.renderHTMLAttribute(writer, message, JSFAttr.STYLE_ATTR, HTML.STYLE_ATTR);
- HtmlRendererUtils.renderHTMLAttribute(writer, message, JSFAttr.STYLE_CLASS_ATTR, HTML.CLASS_ATTR);
+ HtmlRendererUtils.renderHTMLStringAttribute(writer, message, JSFAttr.STYLE_ATTR, HTML.STYLE_ATTR);
+ HtmlRendererUtils.renderHTMLStringAttribute(writer, message, JSFAttr.STYLE_CLASS_ATTR, HTML.CLASS_ATTR);
writer.endElement(HTML.SPAN_ELEM);
}
else if (renderDivWhenNoMessagesAndIdSet && message.getId() != null &&
@@ -247,7 +247,24 @@ public abstract class HtmlMessageRendere
facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) message).getClientBehaviors();
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, message, behaviors);
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventProperties(writer,
+ CommonPropertyUtils.getCommonPropertiesMarked(message), message);
+ }
+ else
+ {
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ CommonPropertyUtils.getCommonPropertiesMarked(message),
+ CommonEventUtils.getCommonEventsMarked(message), message, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, message, behaviors);
+ }
+ }
HtmlRendererUtils.renderHTMLAttributes(writer, message,
HTML.UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE_AND_TITLE);
}
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Thu Jan 12 02:07:58 2012
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
-import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.component.UINamingContainer;
@@ -60,7 +59,8 @@ public class HtmlRadioRendererBase
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
{
- org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, UISelectOne.class);
+ org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(
+ facesContext, uiComponent, UISelectOne.class);
UISelectOne selectOne = (UISelectOne)uiComponent;
@@ -79,7 +79,8 @@ public class HtmlRadioRendererBase
}
else
{
- log.severe("Wrong layout attribute for component " + selectOne.getClientId(facesContext) + ": " + layout);
+ log.severe("Wrong layout attribute for component " +
+ selectOne.getClientId(facesContext) + ": " + layout);
}
}
@@ -109,13 +110,19 @@ public class HtmlRadioRendererBase
HtmlRendererUtils.writeIdIfNecessary(writer, selectOne, facesContext);
}
- if (!pageDirectionLayout) writer.startElement(HTML.TR_ELEM, selectOne);
+ if (!pageDirectionLayout)
+ {
+ writer.startElement(HTML.TR_ELEM, selectOne);
+ }
Converter converter;
- List selectItemList = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(selectOne, facesContext);
+ List selectItemList = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(
+ selectOne, facesContext);
converter = HtmlRendererUtils.findUIOutputConverterFailSafe(facesContext, selectOne);
- Object currentValue = org.apache.myfaces.shared.renderkit.RendererUtils.getStringFromSubmittedValueOrLocalValueReturnNull(facesContext, selectOne);
+ Object currentValue =
+ org.apache.myfaces.shared.renderkit.RendererUtils.getStringFromSubmittedValueOrLocalValueReturnNull(
+ facesContext, selectOne);
int itemNum = 0;
@@ -128,7 +135,10 @@ public class HtmlRadioRendererBase
converter, pageDirectionLayout, itemNum);
}
- if (!pageDirectionLayout) writer.endElement(HTML.TR_ELEM);
+ if (!pageDirectionLayout)
+ {
+ writer.endElement(HTML.TR_ELEM);
+ }
writer.endElement(HTML.TABLE_ELEM);
}
@@ -179,13 +189,16 @@ public class HtmlRadioRendererBase
if (isSelectItemGroup)
{
if (pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectOne);
+ }
writer.startElement(HTML.TD_ELEM, selectOne);
writer.write(selectItem.getLabel());
writer.endElement(HTML.TD_ELEM);
- if (pageDirectionLayout) {
+ if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
writer.startElement(HTML.TR_ELEM, selectOne);
}
@@ -195,7 +208,9 @@ public class HtmlRadioRendererBase
writer.writeAttribute(HTML.BORDER_ATTR, "0", null);
if(!pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectOne);
+ }
SelectItemGroup group = (SelectItemGroup) selectItem;
SelectItem[] selectItems = group.getSelectItems();
@@ -207,17 +222,22 @@ public class HtmlRadioRendererBase
}
if(!pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
writer.endElement(HTML.TABLE_ELEM);
writer.endElement(HTML.TD_ELEM);
if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
}
else
{
- String itemStrValue = org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedStringValue(facesContext, selectOne, converter, selectItem.getValue());
+ String itemStrValue = org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedStringValue(
+ facesContext, selectOne, converter, selectItem.getValue());
boolean itemChecked = (itemStrValue == null) ?
itemStrValue == currentValue :
"".equals(itemStrValue) ?
@@ -237,12 +257,15 @@ public class HtmlRadioRendererBase
writer.write("\t\t");
if (pageDirectionLayout)
+ {
writer.startElement(HTML.TR_ELEM, selectOne);
+ }
writer.startElement(HTML.TD_ELEM, selectOne);
boolean itemDisabled = selectItem.isDisabled();
- String itemId = renderRadio(facesContext, selectOne, itemStrValue, itemDisabled, itemChecked, false, itemNum);
+ String itemId = renderRadio(facesContext, selectOne, itemStrValue, itemDisabled,
+ itemChecked, false, itemNum);
// label element after the input
boolean componentDisabled = isDisabled(facesContext, selectOne);
@@ -252,7 +275,9 @@ public class HtmlRadioRendererBase
writer.endElement(HTML.TD_ELEM);
if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
+ }
// we rendered one radio --> increment itemNum
itemNum++;
@@ -287,7 +312,8 @@ public class HtmlRadioRendererBase
{
String clientId = uiComponent.getClientId(facesContext);
- String itemId = (itemNum == null)? null : clientId + UINamingContainer.getSeparatorChar(facesContext) + itemNum;
+ String itemId = (itemNum == null)? null : clientId +
+ UINamingContainer.getSeparatorChar(facesContext) + itemNum;
ResponseWriter writer = facesContext.getResponseWriter();
@@ -297,13 +323,15 @@ public class HtmlRadioRendererBase
{
writer.writeAttribute(HTML.ID_ATTR, itemId, null);
}
- else if (renderId) {
+ else if (renderId)
+ {
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
}
writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_RADIO, null);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
- if (disabled) {
+ if (disabled)
+ {
writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
}
@@ -322,18 +350,50 @@ public class HtmlRadioRendererBase
}
Map<String, List<ClientBehavior>> behaviors = null;
- if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();
- HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(uiComponent);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderChangeEventProperty(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderFieldEventPropertiesWithoutOnchange(writer,
+ commonPropertiesMarked, uiComponent);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent, behaviors);
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(uiComponent);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, uiComponent, behaviors);
+ }
+ }
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
+ HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS);
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
+ HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
}
if (isDisabled(facesContext, uiComponent))
@@ -355,7 +415,8 @@ public class HtmlRadioRendererBase
return ((HtmlSelectOneRadio)uiComponent).isDisabled();
}
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(
+ uiComponent, HTML.DISABLED_ATTR, false);
}
@@ -374,7 +435,8 @@ public class HtmlRadioRendererBase
}
- public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException
+ public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue)
+ throws ConverterException
{
RendererUtils.checkParamValidity(facesContext, uiComponent, UISelectOne.class);
return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUISelectOneValue(facesContext,
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java Thu Jan 12 02:07:58 2012
@@ -117,14 +117,42 @@ public class HtmlSecretRendererBase
{
behaviors = ((ClientBehaviorHolder) uiComponent).getClientBehaviors();
- HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
- facesContext, writer, uiComponent, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(uiComponent);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderChangeEventProperty(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderFieldEventPropertiesWithoutOnchange(writer,
+ commonPropertiesMarked, uiComponent);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent, behaviors);
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(uiComponent);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, uiComponent, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderInputPassthroughPropertiesWithoutDisabledAndEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(uiComponent), uiComponent);
+ commonPropertiesMarked, uiComponent);
}
else
{
Added: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java?rev=1230370&view=auto
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java (added)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java Thu Jan 12 02:07:58 2012
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.shared.renderkit.html;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UISelectMany;
+import javax.faces.component.UISelectOne;
+import javax.faces.component.behavior.ClientBehavior;
+import javax.faces.component.behavior.ClientBehaviorHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.convert.Converter;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+
+/**
+ *
+ * @author Leonardo Uribe
+ */
+public class HtmlSelectableRendererBase extends HtmlRenderer
+{
+
+ protected void internalRenderSelect(FacesContext facesContext,
+ UIComponent uiComponent, boolean disabled, int size,
+ boolean selectMany, Converter converter) throws IOException
+ {
+ ResponseWriter writer = facesContext.getResponseWriter();
+ writer.startElement(HTML.SELECT_ELEM, uiComponent);
+ if (uiComponent instanceof ClientBehaviorHolder
+ && JavascriptUtils.isJavascriptAllowed(facesContext
+ .getExternalContext())
+ && !((ClientBehaviorHolder) uiComponent).getClientBehaviors()
+ .isEmpty())
+ {
+ writer.writeAttribute(HTML.ID_ATTR,
+ uiComponent.getClientId(facesContext), null);
+ }
+ else
+ {
+ HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent,
+ facesContext);
+ }
+ writer.writeAttribute(HTML.NAME_ATTR,
+ uiComponent.getClientId(facesContext), null);
+ List selectItemList;
+ if (selectMany)
+ {
+ writer.writeAttribute(HTML.MULTIPLE_ATTR, HTML.MULTIPLE_ATTR, null);
+ selectItemList = org.apache.myfaces.shared.renderkit.RendererUtils
+ .getSelectItemList((UISelectMany) uiComponent, facesContext);
+ }
+ else
+ {
+ selectItemList = RendererUtils.getSelectItemList(
+ (UISelectOne) uiComponent, facesContext);
+ }
+
+ if (size == Integer.MIN_VALUE)
+ {
+ //No size given (Listbox) --> size is number of select items
+ writer.writeAttribute(HTML.SIZE_ATTR,
+ Integer.toString(selectItemList.size()), null);
+ }
+ else
+ {
+ writer.writeAttribute(HTML.SIZE_ATTR, Integer.toString(size), null);
+ }
+ Map<String, List<ClientBehavior>> behaviors = null;
+ if (uiComponent instanceof ClientBehaviorHolder
+ && JavascriptUtils.isJavascriptAllowed(facesContext
+ .getExternalContext()))
+ {
+ behaviors = ((ClientBehaviorHolder) uiComponent)
+ .getClientBehaviors();
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(uiComponent);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderChangeEventProperty(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderFieldEventPropertiesWithoutOnchange(writer,
+ commonPropertiesMarked, uiComponent);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer,
+ uiComponent, behaviors);
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(uiComponent);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent,
+ behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(facesContext,
+ writer, uiComponent, behaviors);
+ }
+ }
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderSelectPassthroughPropertiesWithoutDisabledAndEvents(writer,
+ CommonPropertyUtils.getCommonPropertiesMarked(uiComponent), uiComponent);
+ }
+ else
+ {
+ HtmlRendererUtils.renderHTMLAttributes(
+ writer,
+ uiComponent,
+ HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
+ }
+ }
+ else
+ {
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderSelectPassthroughPropertiesWithoutDisabled(writer,
+ CommonPropertyUtils.getCommonPropertiesMarked(uiComponent), uiComponent);
+ }
+ else
+ {
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
+ HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+ }
+ }
+
+ if (disabled)
+ {
+ writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
+ }
+
+ if (HtmlRendererUtils.isReadOnly(uiComponent))
+ {
+ writer.writeAttribute(HTML.READONLY_ATTR, HTML.READONLY_ATTR, null);
+ }
+
+ Set lookupSet = HtmlRendererUtils.getSubmittedOrSelectedValuesAsSet(selectMany,
+ uiComponent, facesContext, converter);
+
+ HtmlRendererUtils.renderSelectOptions(facesContext, uiComponent, converter, lookupSet,
+ selectItemList);
+ // bug #970747: force separate end tag
+ writer.writeText(HtmlRendererUtils.STR_EMPTY, null);
+ writer.endElement(HTML.SELECT_ELEM);
+ }
+
+}
Propchange: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Thu Jan 12 02:07:58 2012
@@ -154,7 +154,24 @@ public class HtmlTableRendererBase exten
{
HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderEventProperties(writer,
+ CommonPropertyUtils.getCommonPropertiesMarked(uiComponent), uiComponent);
+ }
+ else
+ {
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ CommonPropertyUtils.getCommonPropertiesMarked(uiComponent),
+ CommonEventUtils.getCommonEventsMarked(uiComponent), uiComponent, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.TABLE_ATTRIBUTES);
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java Thu Jan 12 02:07:58 2012
@@ -90,7 +90,10 @@ public class HtmlTextRendererBase
{
String text = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
- if (log.isLoggable(Level.FINE)) log.fine("renderOutput '" + text + "'");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("renderOutput '" + text + "'");
+ }
boolean escape;
if (component instanceof HtmlOutputText || component instanceof EscapeCapable)
{
@@ -98,7 +101,8 @@ public class HtmlTextRendererBase
}
else
{
- escape = RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.ESCAPE_ATTR,
+ escape = RendererUtils.getBooleanAttribute(component,
+ org.apache.myfaces.shared.renderkit.JSFAttr.ESCAPE_ATTR,
true); //default is to escape
}
if (text != null)
@@ -152,7 +156,10 @@ public class HtmlTextRendererBase
if (escape)
{
- if (log.isLoggable(Level.FINE)) log.fine("renderOutputText writing '" + text + "'");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("renderOutputText writing '" + text + "'");
+ }
writer.writeText(text, org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
else
@@ -188,7 +195,10 @@ public class HtmlTextRendererBase
String clientId = component.getClientId(facesContext);
String value = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, component);
- if (log.isLoggable(Level.FINE)) log.fine("renderInput '" + value + "'");
+ if (log.isLoggable(Level.FINE))
+ {
+ log.fine("renderInput '" + value + "'");
+ }
writer.startElement(HTML.INPUT_ELEM, component);
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
@@ -203,21 +213,52 @@ public class HtmlTextRendererBase
}
Map<String, List<ClientBehavior>> behaviors = null;
- if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
- HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, component, behaviors);
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, component, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(facesContext, writer, component, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(component);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderChangeEventProperty(writer,
+ commonPropertiesMarked, component);
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, component);
+ CommonPropertyUtils.renderFieldEventPropertiesWithoutOnchange(writer,
+ commonPropertiesMarked, component);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, component, behaviors);
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(component);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, component, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, component, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, component, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, component, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderInputPassthroughPropertiesWithoutDisabledAndEvents(writer,
- CommonPropertyUtils.getCommonPropertiesMarked(component), component);
+ commonPropertiesMarked, component);
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
}
}
else
@@ -229,7 +270,8 @@ public class HtmlTextRendererBase
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
}
}
@@ -259,7 +301,8 @@ public class HtmlTextRendererBase
return ((HtmlInputText)component).isDisabled();
}
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, HTML.DISABLED_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component,
+ HTML.DISABLED_ATTR, false);
}
@@ -305,7 +348,8 @@ public class HtmlTextRendererBase
}
- public Object getConvertedValue(FacesContext facesContext, UIComponent component, Object submittedValue) throws ConverterException
+ public Object getConvertedValue(FacesContext facesContext, UIComponent component, Object submittedValue)
+ throws ConverterException
{
org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, UIOutput.class);
return RendererUtils.getConvertedUIOutputValue(facesContext,
@@ -357,7 +401,9 @@ public class HtmlTextRendererBase
if (escape)
{
if (log.isLoggable(Level.FINE))
+ {
log.fine("renderOutputText writing '" + text + "'");
+ }
writer.writeText(text,
org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR);
}
Modified: myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java?rev=1230370&r1=1230369&r2=1230370&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java (original)
+++ myfaces/core/branches/2.0.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java Thu Jan 12 02:07:58 2012
@@ -96,10 +96,38 @@ public class HtmlTextareaRendererBase
HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
writer.writeAttribute(HTML.NAME_ATTR, uiComponent.getClientId(facesContext), null);
}
- HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
- facesContext, writer, uiComponent, behaviors);
+ long commonPropertiesMarked = 0L;
+ if (isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ commonPropertiesMarked = CommonPropertyUtils.getCommonPropertiesMarked(uiComponent);
+ }
+ if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))
+ {
+ CommonPropertyUtils.renderChangeEventProperty(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderEventProperties(writer,
+ commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderFieldEventPropertiesWithoutOnchange(writer,
+ commonPropertiesMarked, uiComponent);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent, behaviors);
+ if (isCommonEventsOptimizationEnabled(facesContext))
+ {
+ Long commonEventsMarked = CommonEventUtils.getCommonEventsMarked(uiComponent);
+ CommonEventUtils.renderBehaviorizedEventHandlers(facesContext, writer,
+ commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ CommonEventUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, commonPropertiesMarked, commonEventsMarked, uiComponent, behaviors);
+ }
+ else
+ {
+ HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, uiComponent, behaviors);
+ }
+ }
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderCommonFieldPassthroughPropertiesWithoutDisabledAndEvents(writer,