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 2011/11/10 00:44:04 UTC
svn commit: r1200044 [3/7] - in
/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared:
application/ component/ config/ context/flash/ renderkit/ renderkit/html/
renderkit/html/util/ resource/ taglib/ test/ util/ util/el/ util/servlet/
view...
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Wed Nov 9 23:44:02 2011
@@ -50,7 +50,8 @@ import org.apache.myfaces.shared.renderk
* @author Anton Koinov
* @version $Revision$ $Date$
*/
-public class HtmlCheckboxRendererBase extends HtmlRenderer {
+public class HtmlCheckboxRendererBase extends HtmlRenderer
+{
//private static final Log log = LogFactory
// .getLog(HtmlCheckboxRendererBase.class);
private static final Logger log = Logger.getLogger(HtmlCheckboxRendererBase.class.getName());
@@ -62,7 +63,8 @@ public class HtmlCheckboxRendererBase ex
private static final String EXTERNAL_TRUE_VALUE = "true";
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
- throws IOException {
+ throws IOException
+ {
org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
Map<String, List<ClientBehavior>> behaviors = null;
@@ -75,29 +77,42 @@ public class HtmlCheckboxRendererBase ex
}
}
- if (uiComponent instanceof UISelectBoolean) {
+ if (uiComponent instanceof UISelectBoolean)
+ {
Boolean value = org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanValue( uiComponent );
boolean isChecked = value != null ? value.booleanValue() : false;
- renderCheckbox(facesContext, uiComponent, EXTERNAL_TRUE_VALUE, false,isChecked, true, null); //TODO: the selectBoolean is never disabled
- } else if (uiComponent instanceof UISelectMany) {
+ renderCheckbox(facesContext, uiComponent, EXTERNAL_TRUE_VALUE, false,isChecked, true, null);
+ //TODO: the selectBoolean is never disabled
+ }
+ else if (uiComponent instanceof UISelectMany)
+ {
renderCheckboxList(facesContext, (UISelectMany) uiComponent);
- } else {
+ }
+ else
+ {
throw new IllegalArgumentException("Unsupported component class "
+ uiComponent.getClass().getName());
}
}
public void renderCheckboxList(FacesContext facesContext,
- UISelectMany selectMany) throws IOException {
+ UISelectMany selectMany) throws IOException
+ {
String layout = getLayout(selectMany);
boolean pageDirectionLayout = false; //Default to lineDirection
- if (layout != null) {
- if (layout.equals(PAGE_DIRECTION)) {
+ if (layout != null)
+ {
+ if (layout.equals(PAGE_DIRECTION))
+ {
pageDirectionLayout = true;
- } else if (layout.equals(LINE_DIRECTION)) {
+ }
+ else if (layout.equals(LINE_DIRECTION))
+ {
pageDirectionLayout = false;
- } else {
+ }
+ else
+ {
log.severe("Wrong layout attribute for component "
+ selectMany.getClientId(facesContext) + ": " + layout);
}
@@ -131,17 +146,22 @@ public class HtmlCheckboxRendererBase ex
Converter converter = getConverter(facesContext, selectMany);
- Set lookupSet = org.apache.myfaces.shared.renderkit.RendererUtils.getSubmittedValuesAsSet(facesContext, selectMany, converter, selectMany);
+ Set lookupSet = org.apache.myfaces.shared.renderkit.RendererUtils.getSubmittedValuesAsSet(
+ facesContext, selectMany, converter, selectMany);
boolean useSubmittedValues = lookupSet != null;
- if (!useSubmittedValues) {
- lookupSet = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectedValuesAsSet(facesContext, selectMany, converter, selectMany);
+ if (!useSubmittedValues)
+ {
+ lookupSet = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectedValuesAsSet(
+ facesContext, selectMany, converter, selectMany);
}
int itemNum = 0;
- for (Iterator it = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(selectMany, facesContext)
- .iterator(); it.hasNext();) {
+ for (Iterator it = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(
+ selectMany, facesContext)
+ .iterator(); it.hasNext();)
+ {
SelectItem selectItem = (SelectItem) it.next();
itemNum = renderGroupOrItemCheckbox(facesContext, selectMany,
@@ -156,8 +176,10 @@ public class HtmlCheckboxRendererBase ex
writer.endElement(HTML.TABLE_ELEM);
}
- protected String getLayout(UISelectMany selectMany) {
- if (selectMany instanceof HtmlSelectManyCheckbox) {
+ protected String getLayout(UISelectMany selectMany)
+ {
+ if (selectMany instanceof HtmlSelectManyCheckbox)
+ {
return ((HtmlSelectManyCheckbox) selectMany).getLayout();
}
@@ -180,7 +202,8 @@ public class HtmlCheckboxRendererBase ex
protected int renderGroupOrItemCheckbox(FacesContext facesContext,
UIComponent uiComponent, SelectItem selectItem,
boolean useSubmittedValues, Set lookupSet,
- Converter converter, boolean pageDirectionLayout, Integer itemNum) throws IOException
+ Converter converter, boolean pageDirectionLayout,
+ Integer itemNum) throws IOException
{
ResponseWriter writer = facesContext.getResponseWriter();
@@ -239,8 +262,10 @@ public class HtmlCheckboxRendererBase ex
}
else
{
- Object itemValue = selectItem.getValue(); // TODO : Check here for getSubmittedValue. Look at RendererUtils.getValue
- String itemStrValue = org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedStringValue(facesContext, selectMany, converter, itemValue);
+ Object itemValue = selectItem.getValue(); // TODO : Check here for getSubmittedValue.
+ // Look at RendererUtils.getValue
+ String itemStrValue = org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedStringValue(
+ facesContext, selectMany, converter, itemValue);
boolean checked = lookupSet.contains(itemStrValue);
@@ -288,7 +313,8 @@ public class HtmlCheckboxRendererBase ex
@Deprecated
protected void renderCheckbox(FacesContext facesContext,
UIComponent uiComponent, String value, String label,
- boolean disabled, boolean checked, boolean renderId) throws IOException {
+ boolean disabled, boolean checked, boolean renderId) throws IOException
+ {
renderCheckbox(facesContext, uiComponent, value, disabled, checked, renderId, 0);
}
@@ -297,10 +323,13 @@ public class HtmlCheckboxRendererBase ex
* @return the 'id' value of the rendered element
*/
protected String renderCheckbox(FacesContext facesContext,
- UIComponent uiComponent, String value, boolean disabled, boolean checked, boolean renderId, Integer itemNum) throws IOException {
+ UIComponent uiComponent, String value, boolean disabled, boolean checked,
+ boolean renderId, Integer itemNum) throws IOException
+ {
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();
@@ -317,29 +346,37 @@ public class HtmlCheckboxRendererBase ex
writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_CHECKBOX, null);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
- if (checked) {
- writer.writeAttribute(HTML.CHECKED_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.CHECKED_ATTR, null);
+ if (checked)
+ {
+ writer.writeAttribute(HTML.CHECKED_ATTR,
+ org.apache.myfaces.shared.renderkit.html.HTML.CHECKED_ATTR, null);
}
- if (disabled) {
+ if (disabled)
+ {
writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
}
- if ((value != null) && (value.length() > 0)) {
+ if ((value != null) && (value.length() > 0))
+ {
writer.writeAttribute(HTML.VALUE_ATTR, value, null);
}
Map<String, List<ClientBehavior>> behaviors = null;
if (uiComponent instanceof UISelectBoolean)
{
- 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.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_EVENTS);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, uiComponent, behaviors);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
+ HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
}
else
{
@@ -349,14 +386,18 @@ public class HtmlCheckboxRendererBase ex
}
else
{
- 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.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);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchange(
+ facesContext, writer, uiComponent, behaviors);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
+ HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE_AND_EVENTS);
}
else
{
@@ -364,7 +405,8 @@ public class HtmlCheckboxRendererBase ex
HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
}
}
- if (isDisabled(facesContext, uiComponent)) {
+ if (isDisabled(facesContext, uiComponent))
+ {
writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
}
@@ -374,26 +416,38 @@ public class HtmlCheckboxRendererBase ex
}
protected boolean isDisabled(FacesContext facesContext,
- UIComponent component) {
+ UIComponent component)
+ {
//TODO: overwrite in extended HtmlCheckboxRenderer and check for
// enabledOnUserRole
- if (component instanceof HtmlSelectBooleanCheckbox) {
+ if (component instanceof HtmlSelectBooleanCheckbox)
+ {
return ((HtmlSelectBooleanCheckbox) component).isDisabled();
- } else if (component instanceof HtmlSelectManyCheckbox) {
+ }
+ else if (component instanceof HtmlSelectManyCheckbox)
+ {
return ((HtmlSelectManyCheckbox) component).isDisabled();
- } else {
+ }
+ else
+ {
return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component,
HTML.DISABLED_ATTR, false);
}
}
- public void decode(FacesContext facesContext, UIComponent component) {
+ public void decode(FacesContext facesContext, UIComponent component)
+ {
org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, null);
- if (component instanceof UISelectBoolean) {
+ if (component instanceof UISelectBoolean)
+ {
HtmlRendererUtils.decodeUISelectBoolean(facesContext, component);
- } else if (component instanceof UISelectMany) {
+ }
+ else if (component instanceof UISelectMany)
+ {
HtmlRendererUtils.decodeUISelectMany(facesContext, component);
- } else {
+ }
+ else
+ {
throw new IllegalArgumentException("Unsupported component class "
+ component.getClass().getName());
}
@@ -406,14 +460,20 @@ public class HtmlCheckboxRendererBase ex
public Object getConvertedValue(FacesContext facesContext,
UIComponent component, Object submittedValue)
- throws ConverterException {
+ throws ConverterException
+ {
org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, null);
- if (component instanceof UISelectBoolean) {
+ if (component instanceof UISelectBoolean)
+ {
return submittedValue;
- } else if (component instanceof UISelectMany) {
+ }
+ else if (component instanceof UISelectMany)
+ {
return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUISelectManyValue(facesContext,
(UISelectMany) component, submittedValue);
- } else {
+ }
+ else
+ {
throw new IllegalArgumentException("Unsupported component class "
+ component.getClass().getName());
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java Wed Nov 9 23:44:02 2011
@@ -84,7 +84,8 @@ public class HtmlFormRendererBase
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
writer.writeAttribute(HTML.METHOD_ATTR, method, null);
- if (acceptCharset != null) {
+ if (acceptCharset != null)
+ {
writer.writeAttribute(HTML.ACCEPT_CHARSET_ATTR, acceptCharset, null);
}
String encodedActionURL = facesContext.getExternalContext().encodeActionURL(actionURL);
@@ -93,7 +94,8 @@ public class HtmlFormRendererBase
encodedActionURL,
null);
- if (htmlForm instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (htmlForm instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) htmlForm).getClientBehaviors();
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, htmlForm, behaviors);
@@ -105,7 +107,8 @@ public class HtmlFormRendererBase
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, htmlForm, HTML.FORM_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, htmlForm,
+ HTML.FORM_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -139,15 +142,18 @@ public class HtmlFormRendererBase
afterFormElementsStart(facesContext, component);
}
- protected String getActionUrl(FacesContext facesContext, UIForm form) {
+ protected String getActionUrl(FacesContext facesContext, UIForm form)
+ {
return getActionUrl(facesContext);
}
- protected String getMethod(FacesContext facesContext, UIForm form) {
+ protected String getMethod(FacesContext facesContext, UIForm form)
+ {
return "post";
}
- protected String getAcceptCharset(FacesContext facesContext, UIForm form ) {
+ protected String getAcceptCharset(FacesContext facesContext, UIForm form )
+ {
return (String)form.getAttributes().get( JSFAttr.ACCEPTCHARSET_ATTR );
}
@@ -210,7 +216,8 @@ public class HtmlFormRendererBase
writer.endElement(HTML.FORM_ELEM);
}
- private static String getHiddenCommandInputsSetName(FacesContext facesContext, UIComponent form) {
+ private static String getHiddenCommandInputsSetName(FacesContext facesContext, UIComponent form)
+ {
StringBuffer buf = new StringBuffer();
buf.append(HIDDEN_COMMAND_INPUTS_SET_ATTR);
buf.append("_");
@@ -218,7 +225,8 @@ public class HtmlFormRendererBase
return buf.toString();
}
- private static String getScrollHiddenInputName(FacesContext facesContext, UIComponent form) {
+ private static String getScrollHiddenInputName(FacesContext facesContext, UIComponent form)
+ {
StringBuffer buf = new StringBuffer();
buf.append(SCROLL_HIDDEN_INPUT);
buf.append("_");
@@ -258,27 +266,35 @@ public class HtmlFormRendererBase
public static void addHiddenCommandParameter(FacesContext facesContext, UIComponent form, String paramName)
{
- Set set = (Set) facesContext.getExternalContext().getRequestMap().get(getHiddenCommandInputsSetName(facesContext, form));
+ Set set = (Set) facesContext.getExternalContext().getRequestMap().get(
+ getHiddenCommandInputsSetName(facesContext, form));
if (set == null)
{
set = new HashSet();
- facesContext.getExternalContext().getRequestMap().put(getHiddenCommandInputsSetName(facesContext, form), set);
+ facesContext.getExternalContext().getRequestMap().put(
+ getHiddenCommandInputsSetName(facesContext, form), set);
}
set.add(paramName);
}
- public static void renderScrollHiddenInputIfNecessary(UIComponent form, FacesContext facesContext, ResponseWriter writer)
- throws IOException {
- if (form == null) {
+ public static void renderScrollHiddenInputIfNecessary(
+ UIComponent form, FacesContext facesContext, ResponseWriter writer)
+ throws IOException
+ {
+ if (form == null)
+ {
return;
}
- if (facesContext.getExternalContext().getRequestMap().get(getScrollHiddenInputName(facesContext, form)) == null)
+ if (facesContext.getExternalContext().getRequestMap().get(
+ getScrollHiddenInputName(facesContext, form)) == null)
{
- if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll()) {
+ if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll())
+ {
HtmlRendererUtils.renderAutoScrollHiddenInput(facesContext, writer);
}
- facesContext.getExternalContext().getRequestMap().put(getScrollHiddenInputName(facesContext, form), Boolean.TRUE);
+ facesContext.getExternalContext().getRequestMap().put(getScrollHiddenInputName(
+ facesContext, form), Boolean.TRUE);
}
}
@@ -297,7 +313,9 @@ public class HtmlFormRendererBase
*/
protected void beforeFormElementsStart(FacesContext facesContext, UIComponent component)
throws IOException
- {}
+ {
+
+ }
/**
* Called after the state and any elements are added to the form tag in the
@@ -305,7 +323,9 @@ public class HtmlFormRendererBase
*/
protected void afterFormElementsStart(FacesContext facesContext, UIComponent component)
throws IOException
- {}
+ {
+
+ }
/**
* Called before the state and any elements are added to the form tag in the
@@ -313,7 +333,9 @@ public class HtmlFormRendererBase
*/
protected void beforeFormElementsEnd(FacesContext facesContext, UIComponent component)
throws IOException
- {}
+ {
+
+ }
/**
* Called after the state and any elements are added to the form tag in the
@@ -321,5 +343,7 @@ public class HtmlFormRendererBase
*/
protected void afterFormElementsEnd(FacesContext facesContext, UIComponent component)
throws IOException
- {}
+ {
+
+ }
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Wed Nov 9 23:44:02 2011
@@ -94,7 +94,8 @@ public class HtmlGridRendererBase
}
else
{
- Integer i = (Integer)component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.COLUMNS_ATTR);
+ Integer i = (Integer)component.getAttributes().get(
+ org.apache.myfaces.shared.renderkit.JSFAttr.COLUMNS_ATTR);
columns = i != null ? i.intValue() : 0;
}
@@ -102,7 +103,8 @@ public class HtmlGridRendererBase
{
if (log.isLoggable(Level.SEVERE))
{
- log.severe("Wrong columns attribute for PanelGrid " + component.getClientId(facesContext) + ": " + columns);
+ log.severe("Wrong columns attribute for PanelGrid " +
+ component.getClientId(facesContext) + ": " + columns);
}
columns = 1;
}
@@ -121,7 +123,8 @@ public class HtmlGridRendererBase
writer.startElement(HTML.TABLE_ELEM, component);
- if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
if (!behaviors.isEmpty())
{
@@ -140,7 +143,8 @@ public class HtmlGridRendererBase
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.TABLE_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.TABLE_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -187,7 +191,8 @@ public class HtmlGridRendererBase
}
HtmlRendererUtils.writePrettyLineSeparator(context);
- writer.startElement(header ? org.apache.myfaces.shared.renderkit.html.HTML.THEAD_ELEM : HTML.TFOOT_ELEM, component);
+ writer.startElement(
+ header ? org.apache.myfaces.shared.renderkit.html.HTML.THEAD_ELEM : HTML.TFOOT_ELEM, component);
writer.startElement(HTML.TR_ELEM, component);
writer.startElement(header ? HTML.TH_ELEM : HTML.TD_ELEM, component);
@@ -197,11 +202,13 @@ public class HtmlGridRendererBase
((HtmlPanelGrid)component).getFooterClass())
: (header ?
(String)component.getAttributes().get(JSFAttr.HEADER_CLASS_ATTR) :
- (String)component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR));
+ (String)component.getAttributes().get(
+ org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR));
if (styleClass != null)
{
writer.writeAttribute(HTML.CLASS_ATTR, styleClass,
- header ? JSFAttr.HEADER_CLASS_ATTR : org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR);
+ header ? JSFAttr.HEADER_CLASS_ATTR :
+ org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR);
}
if (header)
@@ -246,7 +253,8 @@ public class HtmlGridRendererBase
}
else
{
- columnClasses = (String)component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.COLUMN_CLASSES_ATTR);
+ columnClasses = (String)component.getAttributes().get(
+ org.apache.myfaces.shared.renderkit.JSFAttr.COLUMN_CLASSES_ATTR);
rowClasses = (String)component.getAttributes().get(JSFAttr.ROW_CLASSES_ATTR);
}
@@ -319,12 +327,14 @@ public class HtmlGridRendererBase
//start of new/next row
writer.startElement(HTML.TR_ELEM, component);
- if (rowClassIndex < rowClassesCount) {
+ if (rowClassIndex < rowClassesCount)
+ {
writer.writeAttribute(HTML.CLASS_ATTR, rowClassesArray[rowClassIndex], null);
}
rowStarted = true;
rowClassIndex++;
- if (rowClassIndex == rowClassesCount) {
+ if (rowClassIndex == rowClassesCount)
+ {
rowClassIndex = 0;
}
}
@@ -340,7 +350,8 @@ public class HtmlGridRendererBase
writer.endElement(HTML.TD_ELEM);
columnIndex++;
- if (columnIndex >= columns) {
+ if (columnIndex >= columns)
+ {
columnIndex = 0;
}
}
@@ -353,7 +364,9 @@ public class HtmlGridRendererBase
Level level = context.isProjectStage(ProjectStage.Production) ? Level.FINE : Level.WARNING;
if (log.isLoggable(level))
{
- log.log(level, "PanelGrid " + RendererUtils.getPathToComponent(component) + " has not enough children. Child count should be a multiple of the columns attribute.");
+ log.log(level, "PanelGrid " + RendererUtils.getPathToComponent(component)
+ + " has not enough children. Child count should be a "
+ + "multiple of the columns attribute.");
}
//Render empty columns, so that table is correct
for ( ; columnIndex < columns; columnIndex++)
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Wed Nov 9 23:44:02 2011
@@ -61,7 +61,8 @@ public class HtmlImageRendererBase
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
throws IOException
{
- org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, UIGraphic.class);
+ org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(
+ facesContext, uiComponent, UIGraphic.class);
ResponseWriter writer = facesContext.getResponseWriter();
@@ -97,7 +98,9 @@ public class HtmlImageRendererBase
{
if (facesContext.isProjectStage(ProjectStage.Development) && log.isLoggable(Level.WARNING))
{
- log.warning("Component UIGraphic " + uiComponent.getClientId(facesContext) + " has no attribute url, value, name or attribute resolves to null. Path to component " + RendererUtils.getPathToComponent(uiComponent));
+ log.warning("Component UIGraphic " + uiComponent.getClientId(facesContext)
+ + " has no attribute url, value, name or attribute resolves to null. Path to component "
+ + RendererUtils.getPathToComponent(uiComponent));
}
}
@@ -108,11 +111,14 @@ public class HtmlImageRendererBase
{
if(!facesContext.isProjectStage(ProjectStage.Development) && log.isLoggable(Level.WARNING))
{
- log.warning("Component UIGraphic " + uiComponent.getClientId(facesContext) + " has no attribute alt or attribute resolves to null. Path to component " + RendererUtils.getPathToComponent(uiComponent));
+ log.warning("Component UIGraphic " + uiComponent.getClientId(facesContext)
+ + " has no attribute alt or attribute resolves to null. Path to component "
+ + RendererUtils.getPathToComponent(uiComponent));
}
}
- if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (uiComponent instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, uiComponent, behaviors);
if (isCommonPropertiesOptimizationEnabled(facesContext))
@@ -123,7 +129,8 @@ public class HtmlImageRendererBase
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
+ HTML.IMG_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -136,7 +143,8 @@ public class HtmlImageRendererBase
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
+ HTML.IMG_PASSTHROUGH_ATTRIBUTES);
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Wed Nov 9 23:44:02 2011
@@ -64,7 +64,8 @@ public abstract class HtmlLinkRendererBa
//private static final Log log = LogFactory.getLog(HtmlLinkRenderer.class);
- public static final String END_LINK_OUTCOME_AS_SPAN = "org.apache.myfaces.shared.HtmlLinkRendererBase.END_LINK_OUTCOME_AS_SPAN";
+ public static final String END_LINK_OUTCOME_AS_SPAN =
+ "org.apache.myfaces.shared.HtmlLinkRendererBase.END_LINK_OUTCOME_AS_SPAN";
public boolean getRendersChildren()
{
@@ -86,7 +87,8 @@ public abstract class HtmlLinkRendererBa
String reqValue = (String) facesContext.getExternalContext().getRequestParameterMap().get(
HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo));
if (reqValue != null && reqValue.equals(clientId)
- || HtmlRendererUtils.isPartialOrBehaviorSubmit(facesContext, clientId)) {
+ || HtmlRendererUtils.isPartialOrBehaviorSubmit(facesContext, clientId))
+ {
component.queueEvent(new ActionEvent(component));
RendererUtils.initPartialValidationAndModelUpdate(component, facesContext);
@@ -230,7 +232,8 @@ public abstract class HtmlLinkRendererBa
if (HtmlRendererUtils.isDisabled(component) || formInfo == null)
{
writer.startElement(HTML.SPAN_ELEM, component);
- if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (component instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -242,7 +245,8 @@ public abstract class HtmlLinkRendererBa
HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
}
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, component, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(facesContext, writer, component, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, component, behaviors);
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
@@ -250,7 +254,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -275,7 +280,8 @@ public abstract class HtmlLinkRendererBa
if (component instanceof ClientBehaviorHolder)
{
behaviors = ((ClientBehaviorHolder) component).getClientBehaviors();
- renderBehaviorizedJavaScriptAnchorStart(facesContext, writer, component, clientId, behaviors, formInfo);
+ renderBehaviorizedJavaScriptAnchorStart(
+ facesContext, writer, component, clientId, behaviors, formInfo);
if (!behaviors.isEmpty())
{
HtmlRendererUtils.writeIdAndName(writer, component, facesContext);
@@ -284,8 +290,10 @@ public abstract class HtmlLinkRendererBa
{
HtmlRendererUtils.writeIdIfNecessary(writer, component, facesContext);
}
- HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(facesContext, writer, component, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(facesContext, writer, component, behaviors);
+ HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(
+ facesContext, writer, component, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, component, behaviors);
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutStyleAndEvents(writer,
@@ -293,7 +301,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE_AND_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE_AND_EVENTS);
}
}
else
@@ -307,7 +316,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE);
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE);
}
}
}
@@ -322,7 +332,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, component, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE);
+ HtmlRendererUtils.renderHTMLAttributes(writer, component,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE);
}
}
@@ -377,14 +388,16 @@ public abstract class HtmlLinkRendererBa
onClick.append("var oamSF = function(){");
}
- if (RendererUtils.isAdfOrTrinidadForm(formInfo.getForm())) {
+ if (RendererUtils.isAdfOrTrinidadForm(formInfo.getForm()))
+ {
onClick.append("submitForm('");
onClick.append(formInfo.getForm().getClientId(facesContext));
onClick.append("',1,{source:'");
onClick.append(component.getClientId(facesContext));
onClick.append("'});return false;");
}
- else {
+ else
+ {
HtmlRendererUtils.renderFormSubmitScript(facesContext);
StringBuffer params = addChildParameters(facesContext, component, nestingForm);
@@ -406,7 +419,8 @@ public abstract class HtmlLinkRendererBa
append(clientId).append("'");
}
- if (params.length() > 2 || target != null) {
+ if (params.length() > 2 || target != null)
+ {
onClick.append(",").
append(target == null ? "null" : ("'" + target + "'")).append(",").
append(params);
@@ -415,7 +429,8 @@ public abstract class HtmlLinkRendererBa
//Not necessary since we are using oamSetHiddenInput to create input hidden fields
//render hidden field - todo: in here for backwards compatibility
- if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isRenderHiddenFieldsForLinkParams())
+ if (MyfacesConfig.getCurrentInstance(
+ facesContext.getExternalContext()).isRenderHiddenFieldsForLinkParams())
{
String hiddenFieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo);
addHiddenCommandParameter(facesContext, nestingForm, hiddenFieldName);
@@ -477,7 +492,8 @@ public abstract class HtmlLinkRendererBa
}
//render a javascript that chain the related code
- Collection<ClientBehaviorContext.Parameter> paramList = HtmlRendererUtils.getClientBehaviorContextParameters(
+ Collection<ClientBehaviorContext.Parameter> paramList =
+ HtmlRendererUtils.getClientBehaviorContextParameters(
HtmlRendererUtils.mapAttachedParamsToStringValues(facesContext, component));
onclick = HtmlRendererUtils.buildBehaviorChain(facesContext, component,
@@ -493,9 +509,12 @@ public abstract class HtmlLinkRendererBa
private boolean hasSubmittingBehavior(Map<String, List<ClientBehavior>> clientBehaviors, String eventName)
{
List<ClientBehavior> eventBehaviors = clientBehaviors.get(eventName);
- if (eventBehaviors != null && !eventBehaviors.isEmpty()) {
- for (ClientBehavior behavior : eventBehaviors) {
- if (behavior.getHints().contains(ClientBehaviorHint.SUBMITTING)) {
+ if (eventBehaviors != null && !eventBehaviors.isEmpty())
+ {
+ for (ClientBehavior behavior : eventBehaviors)
+ {
+ if (behavior.getHints().contains(ClientBehaviorHint.SUBMITTING))
+ {
return true;
}
}
@@ -511,21 +530,24 @@ public abstract class HtmlLinkRendererBa
StringBuffer onClick = new StringBuffer();
- if (RendererUtils.isAdfOrTrinidadForm(formInfo.getForm())) {
+ if (RendererUtils.isAdfOrTrinidadForm(formInfo.getForm()))
+ {
onClick.append("submitForm('");
onClick.append(formInfo.getForm().getClientId(facesContext));
onClick.append("',1,{source:'");
onClick.append(component.getClientId(facesContext));
onClick.append("'});return false;");
}
- else {
+ else
+ {
HtmlRendererUtils.renderFormSubmitScript(facesContext);
StringBuffer params = addChildParameters(facesContext, component, nestingForm);
String target = getTarget(component);
- if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isRenderFormSubmitScriptInline())
+ if (MyfacesConfig.getCurrentInstance(
+ facesContext.getExternalContext()).isRenderFormSubmitScriptInline())
{
onClick.append("return ").
append(HtmlRendererUtils.SUBMIT_FORM_FN_NAME).append("('").
@@ -540,7 +562,8 @@ public abstract class HtmlLinkRendererBa
append(clientId).append("'");
}
- if (params.length() > 2 || target != null) {
+ if (params.length() > 2 || target != null)
+ {
onClick.append(",").
append(target == null ? "null" : ("'" + target + "'")).append(",").
append(params);
@@ -556,19 +579,23 @@ public abstract class HtmlLinkRendererBa
return onClick.toString();
}
- private String getTarget(UIComponent component) {
+ private String getTarget(UIComponent component)
+ {
// for performance reason: double check for the target attribute
String target;
- if (component instanceof HtmlCommandLink) {
+ if (component instanceof HtmlCommandLink)
+ {
target = ((HtmlCommandLink) component).getTarget();
}
- else {
+ else
+ {
target = (String) component.getAttributes().get(HTML.TARGET_ATTR);
}
return target;
}
- private StringBuffer addChildParameters(FacesContext context, UIComponent component, UIComponent nestingForm) {
+ private StringBuffer addChildParameters(FacesContext context, UIComponent component, UIComponent nestingForm)
+ {
//add child parameters
StringBuffer params = new StringBuffer();
params.append("[");
@@ -650,7 +677,8 @@ public abstract class HtmlLinkRendererBa
return _ComponentUtils.findNestingForm(uiComponent, facesContext);
}
- protected void addHiddenCommandParameter(FacesContext facesContext, UIComponent nestingForm, String hiddenFieldName)
+ protected void addHiddenCommandParameter(
+ FacesContext facesContext, UIComponent nestingForm, String hiddenFieldName)
{
if (nestingForm != null)
{
@@ -683,9 +711,12 @@ public abstract class HtmlLinkRendererBa
}
else
{
- if (strictXhtmlLinks) {
+ if (strictXhtmlLinks)
+ {
hrefBuf.append("&");
- } else {
+ }
+ else
+ {
hrefBuf.append('&');
}
}
@@ -738,7 +769,8 @@ public abstract class HtmlLinkRendererBa
if (HtmlRendererUtils.isDisabled(output))
{
writer.startElement(HTML.SPAN_ELEM, output);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -750,7 +782,8 @@ public abstract class HtmlLinkRendererBa
HtmlRendererUtils.writeIdIfNecessary(writer, output, facesContext);
}
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
@@ -758,7 +791,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, output,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -821,7 +855,8 @@ public abstract class HtmlLinkRendererBa
//write anchor
writer.startElement(HTML.ANCHOR_ELEM, output);
writer.writeURIAttribute(HTML.HREF_ATTR, href, null);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -833,7 +868,8 @@ public abstract class HtmlLinkRendererBa
HtmlRendererUtils.writeIdAndNameIfNecessary(writer, output, facesContext);
}
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
@@ -841,7 +877,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, output,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -874,7 +911,8 @@ public abstract class HtmlLinkRendererBa
{
output.getAttributes().put(END_LINK_OUTCOME_AS_SPAN, Boolean.TRUE);
writer.startElement(HTML.SPAN_ELEM, output);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -886,7 +924,8 @@ public abstract class HtmlLinkRendererBa
HtmlRendererUtils.writeIdIfNecessary(writer, output, facesContext);
}
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
@@ -894,7 +933,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, output,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -923,7 +963,8 @@ public abstract class HtmlLinkRendererBa
//write anchor
writer.startElement(HTML.ANCHOR_ELEM, output);
writer.writeURIAttribute(HTML.HREF_ATTR, targetHref, null);
- if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (output instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) output).getClientBehaviors();
if (!behaviors.isEmpty())
@@ -935,7 +976,8 @@ public abstract class HtmlLinkRendererBa
HtmlRendererUtils.writeIdAndNameIfNecessary(writer, output, facesContext);
}
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, output, behaviors);
- HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(facesContext, writer, output, behaviors);
+ HtmlRendererUtils.renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
+ facesContext, writer, output, behaviors);
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderAnchorPassthroughPropertiesWithoutEvents(writer,
@@ -943,7 +985,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, output,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_EVENTS);
}
}
else
@@ -956,7 +999,8 @@ public abstract class HtmlLinkRendererBa
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
+ HtmlRendererUtils.renderHTMLAttributes(writer, output,
+ HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
}
}
@@ -978,7 +1022,8 @@ public abstract class HtmlLinkRendererBa
onClick.append(jsForm);
onClick.append(".elements['").append(name).append("']");
//UIParameter is no ValueHolder, so no conversion possible
- String strParamValue = value != null ? org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(value.toString(), false, false) : "";
+ String strParamValue = value != null ? org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(
+ value.toString(), false, false) : "";
onClick.append(".value='").append(strParamValue).append("';");
addHiddenCommandParameter(FacesContext.getCurrentInstance(), nestingForm, name);
@@ -989,17 +1034,25 @@ public abstract class HtmlLinkRendererBa
StringBuffer hrefBuf,
boolean firstParameter,
String charEncoding,
- boolean strictXhtmlLinks) throws UnsupportedEncodingException {
- if (name == null) {
+ boolean strictXhtmlLinks) throws UnsupportedEncodingException
+ {
+ if (name == null)
+ {
throw new IllegalArgumentException("Unnamed parameter value not allowed within command link.");
}
- if (firstParameter) {
+ if (firstParameter)
+ {
hrefBuf.append('?');
- } else {
- if (strictXhtmlLinks) {
+ }
+ else
+ {
+ if (strictXhtmlLinks)
+ {
hrefBuf.append("&");
- } else {
+ }
+ else
+ {
hrefBuf.append('&');
}
}
@@ -1018,7 +1071,8 @@ public abstract class HtmlLinkRendererBa
{
ResponseWriter writer = facesContext.getResponseWriter();
- if (HtmlRendererUtils.isDisabled(component) || component.getAttributes().remove(END_LINK_OUTCOME_AS_SPAN) != null)
+ if (HtmlRendererUtils.isDisabled(component) || component.getAttributes().remove(
+ END_LINK_OUTCOME_AS_SPAN) != null)
{
writer.endElement(HTML.SPAN_ELEM);
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java Wed Nov 9 23:44:02 2011
@@ -100,7 +100,8 @@ public class HtmlListboxRendererBase
}
else
{
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent,
+ org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, false);
}
}
@@ -128,7 +129,8 @@ public class HtmlListboxRendererBase
}
}
- public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException
+ public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue)
+ throws ConverterException
{
org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java Wed Nov 9 23:44:02 2011
@@ -18,9 +18,9 @@
*/
package org.apache.myfaces.shared.renderkit.html;
-import org.apache.myfaces.shared.renderkit.RendererUtils;
-import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
-import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectMany;
@@ -32,9 +32,9 @@ import javax.faces.component.html.HtmlSe
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
/**
* X-CHECKED: tlddoc of h:selectManyListbox
@@ -97,7 +97,8 @@ public class HtmlMenuRendererBase
}
else
{
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent,
+ org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, false);
}
}
@@ -124,7 +125,8 @@ public class HtmlMenuRendererBase
}
}
- public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException
+ public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue)
+ throws ConverterException
{
org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Wed Nov 9 23:44:02 2011
@@ -66,7 +66,8 @@ public abstract class HtmlMessageRendere
renderMessage(facesContext, message, false);
}
- protected void renderMessage(FacesContext facesContext, UIComponent message, boolean alwaysRenderSpan) throws IOException
+ protected void renderMessage(FacesContext facesContext, UIComponent message,
+ boolean alwaysRenderSpan) throws IOException
{
renderMessage(facesContext, message, alwaysRenderSpan, false);
}
@@ -76,7 +77,8 @@ public abstract class HtmlMessageRendere
* @param message
* @param alwaysRenderSpan if true will render a span even if there is no message
*/
- protected void renderMessage(FacesContext facesContext, UIComponent message, boolean alwaysRenderSpan, boolean renderDivWhenNoMessagesAndIdSet) throws IOException
+ protected void renderMessage(FacesContext facesContext, UIComponent message,
+ boolean alwaysRenderSpan, boolean renderDivWhenNoMessagesAndIdSet) throws IOException
{
String forAttr = getFor(message);
if (forAttr == null)
@@ -88,7 +90,11 @@ public abstract class HtmlMessageRendere
UIComponent forComponent = message.findComponent(forAttr);
if (forComponent == null)
{
- log.severe("Could not render Message. Unable to find component '" + forAttr + "' (calling findComponent on component '" + message.getClientId(facesContext) + "'). If the provided id was correct, wrap the message and its component into an h:panelGroup or h:panelGrid.");
+ log.severe("Could not render Message. Unable to find component '"
+ + forAttr + "' (calling findComponent on component '"
+ + message.getClientId(facesContext)
+ + "'). If the provided id was correct, wrap the message and its "
+ + "component into an h:panelGroup or h:panelGrid.");
return;
}
@@ -107,7 +113,8 @@ public abstract class HtmlMessageRendere
HtmlRendererUtils.renderHTMLAttribute(writer, message, JSFAttr.STYLE_CLASS_ATTR, HTML.CLASS_ATTR);
writer.endElement(HTML.SPAN_ELEM);
}
- else if (renderDivWhenNoMessagesAndIdSet && message.getId() != null && !message.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
+ else if (renderDivWhenNoMessagesAndIdSet && message.getId() != null &&
+ !message.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
{
// show span anyways in case there's a client side update, ie: ajax
ResponseWriter writer = facesContext.getResponseWriter();
@@ -172,14 +179,16 @@ public abstract class HtmlMessageRendere
throws IOException
{
Map<String, List<ClientBehavior>> behaviors = null;
- if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) message).getClientBehaviors();
}
boolean wrapSpan = (message.getId() != null && !message.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
|| (behaviors != null && !behaviors.isEmpty());
- renderSingleFacesMessage(facesContext, message, facesMessage, messageClientId, renderId, renderStyleAndStyleClass, wrapSpan);
+ renderSingleFacesMessage(facesContext, message, facesMessage, messageClientId,
+ renderId, renderStyleAndStyleClass, wrapSpan);
}
protected void renderSingleFacesMessage(FacesContext facesContext,
@@ -192,7 +201,8 @@ public abstract class HtmlMessageRendere
throws IOException
{
// determine style and style class
- String[] styleAndClass = HtmlMessageRendererBase.getStyleAndStyleClass(message, facesMessage.getSeverity());
+ String[] styleAndClass = HtmlMessageRendererBase.getStyleAndStyleClass(
+ message, facesMessage.getSeverity());
String style = styleAndClass[0];
String styleClass = styleAndClass[1];
@@ -212,7 +222,8 @@ public abstract class HtmlMessageRendere
boolean span = false;
Map<String, List<ClientBehavior>> behaviors = null;
- if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed
+ (facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) message).getClientBehaviors();
}
@@ -232,28 +243,35 @@ public abstract class HtmlMessageRendere
{
HtmlRendererUtils.writeIdIfNecessary(writer, message, facesContext);
}
- if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (message instanceof ClientBehaviorHolder && JavascriptUtils.isJavascriptAllowed(
+ facesContext.getExternalContext()))
{
behaviors = ((ClientBehaviorHolder) message).getClientBehaviors();
HtmlRendererUtils.renderBehaviorizedEventHandlers(facesContext, writer, message, behaviors);
- HtmlRendererUtils.renderHTMLAttributes(writer, message, HTML.UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE_AND_TITLE);
+ HtmlRendererUtils.renderHTMLAttributes(writer, message,
+ HTML.UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE_AND_TITLE);
}
else
{
- HtmlRendererUtils.renderHTMLAttributes(writer, message, HTML.MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS);
+ HtmlRendererUtils.renderHTMLAttributes(writer, message,
+ HTML.MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS);
}
}
else
{
span = HtmlRendererUtils.renderHTMLAttributesWithOptionalStartElement(
- writer, message, HTML.SPAN_ELEM, HTML.MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS);
+ writer, message, HTML.SPAN_ELEM,
+ HTML.MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS);
}
- span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.TITLE_ATTR, title, span);
+ span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(
+ writer, message, HTML.SPAN_ELEM, HTML.TITLE_ATTR, title, span);
if (renderStyleAndStyleClass)
{
- span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.STYLE_ATTR, style, span);
- span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(writer, message, HTML.SPAN_ELEM, HTML.STYLE_CLASS_ATTR, styleClass, span);
+ span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(
+ writer, message, HTML.SPAN_ELEM, HTML.STYLE_ATTR, style, span);
+ span |= HtmlRendererUtils.renderHTMLAttributeWithOptionalStartElement(
+ writer, message, HTML.SPAN_ELEM, HTML.STYLE_CLASS_ATTR, styleClass, span);
}
@@ -389,7 +407,8 @@ public abstract class HtmlMessageRendere
return ((HtmlMessage) component).isTooltip();
}
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component,
+ org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
}
@@ -400,7 +419,8 @@ public abstract class HtmlMessageRendere
return ((UIMessage) component).isShowSummary();
}
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_SUMMARY_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component,
+ org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_SUMMARY_ATTR, false);
}
@@ -411,7 +431,8 @@ public abstract class HtmlMessageRendere
return ((UIMessage) component).isShowDetail();
}
- return RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_DETAIL_ATTR, false);
+ return RendererUtils.getBooleanAttribute(component,
+ org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_DETAIL_ATTR, false);
}
@@ -422,7 +443,8 @@ public abstract class HtmlMessageRendere
return ((UIMessage) component).isRedisplay();
}
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.REDISPLAY_ATTR, true);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component,
+ org.apache.myfaces.shared.renderkit.JSFAttr.REDISPLAY_ATTR, true);
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java Wed Nov 9 23:44:02 2011
@@ -68,7 +68,8 @@ public abstract class HtmlMessagesRender
}
protected void renderMessages(FacesContext facesContext,
- UIComponent messages, boolean alwaysRenderSpan, boolean renderDivWhenNoMessagesAndIdSet)
+ UIComponent messages, boolean alwaysRenderSpan,
+ boolean renderDivWhenNoMessagesAndIdSet)
throws IOException
{
// check the for attribute
@@ -79,7 +80,11 @@ public abstract class HtmlMessagesRender
forComponent = messages.findComponent(forAttr);
if (forComponent == null)
{
- log.severe("Could not render Messages. Unable to find component '" + forAttr + "' (calling findComponent on component '" + messages.getClientId(facesContext) + "'). If the provided id was correct, wrap the message and its component into an h:panelGroup or h:panelGrid.");
+ log.severe("Could not render Messages. Unable to find component '"
+ + forAttr + "' (calling findComponent on component '"
+ + messages.getClientId(facesContext)
+ + "'). If the provided id was correct, wrap the message and its "
+ + "component into an h:panelGroup or h:panelGrid.");
return;
}
}
@@ -113,7 +118,8 @@ public abstract class HtmlMessagesRender
}
else
{
- if (renderDivWhenNoMessagesAndIdSet && messages.getId() != null && !messages.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
+ if (renderDivWhenNoMessagesAndIdSet && messages.getId() != null &&
+ !messages.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX))
{
ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(HTML.DIV_ELEM, messages);
@@ -134,7 +140,8 @@ public abstract class HtmlMessagesRender
writer.writeAttribute(HTML.ID_ATTR,messages.getClientId(facesContext),null);
if(messages.getAttributes().get(JSFAttr.STYLE_CLASS_ATTR)!=null)
{
- writer.writeAttribute(HTML.CLASS_ATTR, messages.getAttributes().get(JSFAttr.STYLE_CLASS_ATTR), null);
+ writer.writeAttribute(
+ HTML.CLASS_ATTR, messages.getAttributes().get(JSFAttr.STYLE_CLASS_ATTR), null);
}
if(messages.getAttributes().get(JSFAttr.STYLE_ATTR)!=null)
{
@@ -172,7 +179,8 @@ public abstract class HtmlMessagesRender
HtmlRendererUtils.renderHTMLAttributes(writer, messages, HTML.UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR, getComponentStyle(messages));
- HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR, getComponentStyleClass(messages));
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR,
+ getComponentStyleClass(messages));
while(messagesIterator.hasNext())
{
@@ -224,7 +232,8 @@ public abstract class HtmlMessagesRender
HtmlRendererUtils.renderHTMLAttributes(writer, messages, HTML.UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR, getComponentStyle(messages));
- HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR, getComponentStyleClass(messages));
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR,
+ getComponentStyleClass(messages));
while(messagesIterator.hasNext())
{
@@ -379,7 +388,8 @@ public abstract class HtmlMessagesRender
}
else
{
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component,
+ org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
}
}
@@ -403,7 +413,8 @@ public abstract class HtmlMessagesRender
}
else
{
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, JSFAttr.SHOW_DETAIL_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(
+ component, JSFAttr.SHOW_DETAIL_ATTR, false);
}
}
@@ -415,7 +426,8 @@ public abstract class HtmlMessagesRender
}
else
{
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, JSFAttr.GLOBAL_ONLY_ATTR, false);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(
+ component, JSFAttr.GLOBAL_ONLY_ATTR, false);
}
}
@@ -448,7 +460,8 @@ public abstract class HtmlMessagesRender
return ((UIMessages) component).isRedisplay();
}
- return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.REDISPLAY_ATTR, true);
+ return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(
+ component, org.apache.myfaces.shared.renderkit.JSFAttr.REDISPLAY_ATTR, true);
}
@@ -462,7 +475,8 @@ public abstract class HtmlMessagesRender
private boolean _redisplay;
private Object _next;
- public MessagesIterator(FacesContext facesContext, boolean globalOnly, boolean redisplay, UIComponent forComponent)
+ public MessagesIterator(FacesContext facesContext, boolean globalOnly, boolean redisplay,
+ UIComponent forComponent)
{
_facesContext = facesContext;
// The for attribute is mutually exclusive with globalOnly and take precedence if used.
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlOutcomeTargetButtonRendererBase.java Wed Nov 9 23:44:02 2011
@@ -147,7 +147,8 @@ public class HtmlOutcomeTargetButtonRend
}
else
{
- CommonPropertyUtils.renderEventPropertiesWithoutOnclick(writer, commonPropertiesMarked, uiComponent);
+ CommonPropertyUtils.renderEventPropertiesWithoutOnclick(
+ writer, commonPropertiesMarked, uiComponent);
CommonPropertyUtils.renderFocusBlurEventProperties(writer, commonPropertiesMarked, uiComponent);
}
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?rev=1200044&r1=1200043&r2=1200044&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Wed Nov 9 23:44:02 2011
@@ -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);
}
}
@@ -115,10 +116,13 @@ public class HtmlRadioRendererBase
}
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;
@@ -193,7 +197,8 @@ public class HtmlRadioRendererBase
writer.write(selectItem.getLabel());
writer.endElement(HTML.TD_ELEM);
- if (pageDirectionLayout) {
+ if (pageDirectionLayout)
+ {
writer.endElement(HTML.TR_ELEM);
writer.startElement(HTML.TR_ELEM, selectOne);
}
@@ -231,7 +236,8 @@ public class HtmlRadioRendererBase
}
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) ?
@@ -258,7 +264,8 @@ public class HtmlRadioRendererBase
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);
@@ -305,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();
@@ -315,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);
}
@@ -340,18 +350,22 @@ 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);
+ 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))
@@ -373,7 +387,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);
}
@@ -392,7 +407,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,