You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/05/12 15:03:44 UTC
svn commit: r537407 [2/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/webapp/
sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/
sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/ht...
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java Sat May 12 06:03:42 2007
@@ -27,7 +27,6 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_REQUIRED;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.SelectOneRendererBase;
@@ -84,13 +83,13 @@
writer.writeIdAttribute(clientId);
writer.writeAttribute(HtmlAttributes.DISABLED,
ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED));
- writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+ writer.writeStyleAttribute();
writer.writeClassAttribute();
- writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
- writer.writeAttribute(HtmlAttributes.SIZE, 2, null); // should be greater 1
+ writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
+ writer.writeAttribute(HtmlAttributes.SIZE, 2); // should be greater 1
if (!ComponentUtil.getBooleanAttribute(component, ATTR_REQUIRED)) {
- writer.writeAttribute(HtmlAttributes.ONCHANGE, "Tobago.selectOneListboxChange(this)", null);
- writer.writeAttribute(HtmlAttributes.ONCLICK, "Tobago.selectOneListboxClick(this)", null);
+ writer.writeAttribute(HtmlAttributes.ONCHANGE, "Tobago.selectOneListboxChange(this)", false);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, "Tobago.selectOneListboxClick(this)", false);
}
Object[] values = {component.getValue()};
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java Sat May 12 06:03:42 2007
@@ -27,7 +27,6 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INLINE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_REQUIRED;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.RenderUtil;
@@ -83,13 +82,13 @@
if (!inline) {
writer.startElement(HtmlConstants.TABLE, component);
//writer.writeComponentClass();
- writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
- writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
- writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.BORDER, 0);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
+ writer.writeStyleAttribute();
if (title != null) {
- writer.writeAttribute(HtmlAttributes.TITLE, title, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
}
@@ -106,22 +105,22 @@
+ NamingContainer.SEPARATOR_CHAR + item.getValue().toString();
clientIds.add(id);
writer.startElement(HtmlConstants.INPUT, component);
- writer.writeAttribute(HtmlAttributes.TYPE, "radio", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "radio", false);
writer.writeClassAttribute();
if (item.getValue().equals(value)) {
- writer.writeAttribute(HtmlAttributes.CHECKED, "checked", null);
+ writer.writeAttribute(HtmlAttributes.CHECKED, "checked", false);
}
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(id);
String formattedValue
= RenderUtil.getFormattedValue(facesContext, component, item.getValue());
- writer.writeAttribute(HtmlAttributes.VALUE, formattedValue, null);
+ writer.writeAttribute(HtmlAttributes.VALUE, formattedValue, true);
writer.writeAttribute(HtmlAttributes.DISABLED,
ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED));
- writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
if (!ComponentUtil.getBooleanAttribute(component, ATTR_REQUIRED)) {
- writer.writeAttribute(HtmlAttributes.ONCLICK, "Tobago.selectOneRadioClick(this, '" + clientId + "')", null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, "Tobago.selectOneRadioClick(this, '" + clientId + "')", false);
}
writer.endElement(HtmlConstants.INPUT);
@@ -137,8 +136,8 @@
// FIXME: see outcommented part
writer.startElement(HtmlConstants.LABEL, null);
writer.writeClassAttribute("tobago-label-default");
- writer.writeAttribute(HtmlAttributes.FOR, id, null);
- writer.writeText(item.getLabel(), null);
+ writer.writeAttribute(HtmlAttributes.FOR, id, false);
+ writer.writeText(item.getLabel());
writer.endElement(HtmlConstants.LABEL);
// Application application = tobagoContext.getApplication();
// UIOutput label = (UIOutput)
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Sat May 12 06:03:42 2007
@@ -134,7 +134,7 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(sheetId + "_outer_div");
writer.writeClassAttribute("tobago-sheet-outer-div");
- writer.writeAttribute(HtmlAttributes.STYLE, sheetStyle, null);
+ writer.writeStyleAttribute(sheetStyle);
renderSheet(facesContext, data);
@@ -221,20 +221,20 @@
writer.startElement(HtmlConstants.INPUT, null);
writer.writeIdAttribute(sheetId + WIDTHS_POSTFIX);
writer.writeNameAttribute(sheetId + WIDTHS_POSTFIX);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
- writer.writeAttribute(HtmlAttributes.VALUE, "", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
+ writer.writeAttribute(HtmlAttributes.VALUE, "", false);
writer.endElement(HtmlConstants.INPUT);
writer.startElement(HtmlConstants.INPUT, null);
writer.writeIdAttribute(sheetId + SCROLL_POSTFIX);
writer.writeNameAttribute(sheetId + SCROLL_POSTFIX);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
Integer[] scrollPosition = data.getScrollPosition();
if (scrollPosition != null) {
String scroll = scrollPosition[0] + ";" + scrollPosition[1];
- writer.writeAttribute(HtmlAttributes.VALUE, scroll, null);
+ writer.writeAttribute(HtmlAttributes.VALUE, scroll, false);
} else {
- writer.writeAttribute(HtmlAttributes.VALUE, "", null);
+ writer.writeAttribute(HtmlAttributes.VALUE, "", false);
}
writer.endElement(HtmlConstants.INPUT);
@@ -242,8 +242,8 @@
writer.startElement(HtmlConstants.INPUT, null);
writer.writeIdAttribute(sheetId + SELECTED_POSTFIX);
writer.writeNameAttribute(sheetId + SELECTED_POSTFIX);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
- writer.writeAttribute(HtmlAttributes.VALUE, selectedRows, null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
+ writer.writeAttribute(HtmlAttributes.VALUE, selectedRows, true);
writer.endElement(HtmlConstants.INPUT);
}
@@ -256,7 +256,7 @@
writer.writeClassAttribute("tobago-sheet-header-div");
HtmlStyleMap headerStyle = (HtmlStyleMap) attributes.get(ATTR_STYLE_HEADER);
if (headerStyle != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, headerStyle, null);
+ writer.writeStyleAttribute(headerStyle);
}
int columnCount = 0;
@@ -269,11 +269,11 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(sheetId + "_header_box_filler");
writer.writeClassAttribute("tobago-sheet-header-box");
- writer.writeAttribute(HtmlAttributes.STYLE, "width: 0px", null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "width: 0px", false);
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-sheet-header");
- writer.writeText("", null);
+ writer.flush();
writer.write(" ");
writer.endElement(HtmlConstants.DIV);
@@ -288,7 +288,7 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(sheetId + "_data_div");
writer.writeClassAttribute("tobago-sheet-body-div ");
- writer.writeAttribute(HtmlAttributes.STYLE, bodyStyle.toString() + (showHeader?"":" padding-top: 0px;"), null);
+ writer.writeAttribute(HtmlAttributes.STYLE, bodyStyle.toString() + (showHeader?"":" padding-top: 0px;"), false);
Integer space = HtmlRendererUtil.getStyleAttributeIntValue(bodyStyle, "width");
HtmlStyleMap sheetBodyStyle = (HtmlStyleMap) bodyStyle.clone();
//String sheetBodyStyle;
@@ -305,17 +305,17 @@
writer.startElement(HtmlConstants.TABLE, null);
- writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
- writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
writer.writeClassAttribute("tobago-sheet-body-table");
- writer.writeAttribute(HtmlAttributes.STYLE, sheetBodyStyle, null);
+ writer.writeStyleAttribute(sheetBodyStyle);
if (columnWidths != null) {
writer.startElement(HtmlConstants.COLGROUP, null);
for (Integer columnWidth : columnWidths) {
writer.startElement(HtmlConstants.COL, null);
- writer.writeAttribute(HtmlAttributes.WIDTH, columnWidth, null);
+ writer.writeAttribute(HtmlAttributes.WIDTH, columnWidth);
writer.endElement(HtmlConstants.COL);
}
writer.endElement(HtmlConstants.COLGROUP);
@@ -349,7 +349,7 @@
writer.startElement(HtmlConstants.TR, null);
writer.writeClassAttribute(rowClass);
writer.writeIdAttribute(sheetId + "_data_tr_" + rowIndex);
- writer.writeText("", null);
+ writer.flush();
int columnIndex = -1;
@@ -370,27 +370,26 @@
writer.writeClassAttribute(tdClass.toString());
final String align = (String) column.getAttributes().get(ATTR_ALIGN);
if (align != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, HtmlRendererUtil.toStyleString("text-align", align) , null);
+ writer.writeStyleAttribute(HtmlRendererUtil.toStyleString("text-align", align));
}
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(
sheetId + "_data_row_" + visibleIndex + "_column" + columnIndex);
writer.writeClassAttribute("tobago-sheet-cell-outer");
- writer.writeAttribute(HtmlAttributes.STYLE,
- HtmlRendererUtil.toStyleString("width", columnWidths.get(columnIndex)), null);
+ writer.writeStyleAttribute(HtmlRendererUtil.toStyleString("width", columnWidths.get(columnIndex)));
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-sheet-cell-inner");
- writer.writeText("", null);
+ writer.flush();
if (column instanceof UIColumnSelector) {
final boolean disabled
= ComponentUtil.getBooleanAttribute(column, ATTR_DISABLED);
writer.startElement(HtmlConstants.IMG, null);
if (disabled) {
- writer.writeAttribute(HtmlAttributes.SRC, selectorDisabled, null);
+ writer.writeAttribute(HtmlAttributes.SRC, selectorDisabled, false);
} else {
- writer.writeAttribute(HtmlAttributes.SRC, unchecked, null);
+ writer.writeAttribute(HtmlAttributes.SRC, unchecked, false);
}
writer.writeIdAttribute(sheetId + "_data_row_selector_" + rowIndex);
writer.writeClassAttribute("tobago-sheet-column-selector");
@@ -415,8 +414,8 @@
writer.writeIdAttribute(
sheetId + "_data_row_" + visibleIndex + "_column_filler");
writer.writeClassAttribute("tobago-sheet-cell-outer");
- writer.writeAttribute(HtmlAttributes.STYLE, "width: 0px;", null);
- writer.writeText("", null);
+ writer.writeStyleAttribute("width: 0px;");
+ writer.flush();
writer.write(" ");
writer.endElement(HtmlConstants.DIV);
@@ -453,7 +452,7 @@
writer.startElement(HtmlConstants.DIV, data);
writer.writeClassAttribute("tobago-sheet-footer");
- writer.writeAttribute(HtmlAttributes.STYLE, footerStyle, null);
+ writer.writeStyleAttribute(footerStyle);
if (isValidPagingValue(showRowRange)) {
@@ -470,11 +469,11 @@
writer.startElement(HtmlConstants.SPAN, null);
writer.writeAttribute(HtmlAttributes.ONCLICK, "tobagoSheetEditPagingRow(this, '"
- + pagerCommandId + "', '" + pagingOnClick + "')", null);
+ + pagerCommandId + "', '" + pagingOnClick + "')", true);
writer.writeClassAttribute(className);
writer.writeAttribute(HtmlAttributes.TITLE, ResourceManagerUtil.getPropertyNotNull(
- facesContext, "tobago", "sheetPagingInfoRowPagingTip"), null);
- writer.writeText("", null);
+ facesContext, "tobago", "sheetPagingInfoRowPagingTip"), true);
+ writer.writeText("");
writer.write(createSheetPagingInfo(data, facesContext,
pagerCommandId, true));
writer.endElement(HtmlConstants.SPAN);
@@ -510,7 +509,7 @@
writer.startElement(HtmlConstants.SPAN, null);
writer.writeClassAttribute(className);
writer.writeIdAttribute(sheetId + SUBCOMPONENT_SEP + "pagingPages");
- writer.writeText("", null);
+ writer.writeText("");
boolean atBeginning = data.isAtBeginning();
link(facesContext, application, atBeginning, PageAction.FIRST, data);
@@ -518,10 +517,10 @@
writer.startElement(HtmlConstants.SPAN, null);
writer.writeClassAttribute("tobago-sheet-paging-pages-text");
writer.writeAttribute(HtmlAttributes.ONCLICK, "tobagoSheetEditPagingRow(this, '"
- + pagerCommandId + "', '" + pagingOnClick + "')", null);
+ + pagerCommandId + "', '" + pagingOnClick + "')", true);
writer.writeAttribute(HtmlAttributes.TITLE, ResourceManagerUtil.getPropertyNotNull(
- facesContext, "tobago", "sheetPagingInfoPagePagingTip"), null);
- writer.writeText("", null);
+ facesContext, "tobago", "sheetPagingInfoPagePagingTip"), true);
+ writer.writeText("");
writer.write(createSheetPagingInfo(
data, facesContext, pagerCommandId, false));
writer.endElement(HtmlConstants.SPAN);
@@ -741,13 +740,13 @@
+ SUBCOMPONENT_SEP + "pagingPages" + SUBCOMPONENT_SEP + command.getToken());
writer.writeClassAttribute("tobago-sheet-footer-pager-button"
+ (disabled ? " tobago-sheet-footer-pager-button-disabled" : ""));
- writer.writeAttribute(HtmlAttributes.SRC, image, null);
- writer.writeAttribute(HtmlAttributes.TITLE, tip, null);
+ writer.writeAttribute(HtmlAttributes.SRC, image, false);
+ writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
writer.writeAttribute(HtmlAttributes.ALT, "", false);
if (!disabled) {
CommandRendererHelper helper = new CommandRendererHelper(facesContext, link);
String onClick = helper.getOnclick();
- writer.writeAttribute(HtmlAttributes.ONCLICK, onClick, null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, onClick, true);
}
writer.endElement(HtmlConstants.IMG);
}
@@ -765,7 +764,7 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(sheetId + "_header_box_" + columnCount);
writer.writeClassAttribute("tobago-sheet-header-box");
- writer.writeAttribute(HtmlAttributes.STYLE, divWidth, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, divWidth, false);
String tip = (String) column.getAttributes().get(ATTR_TIP);
if (tip == null) {
tip = "";
@@ -790,7 +789,7 @@
}
String onclick = "Tobago.submitAction('" + sortCommand.getClientId(facesContext) + "')";
- writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, false);
if (StringUtils.isNotEmpty(tip)) {
tip += " - ";
@@ -813,7 +812,7 @@
// ############################################
// ############################################
- writer.writeAttribute(HtmlAttributes.TITLE, tip, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, tip, true);
String align = (String) column.getAttributes().get(ATTR_ALIGN);
@@ -821,7 +820,7 @@
writer.writeIdAttribute(sheetId + "_header_outer_" + columnCount);
writer.writeClassAttribute("tobago-sheet-header" + sorterClass);
if (align != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, "text-align: " + align + ";", null);
+ writer.writeStyleAttribute("text-align: " + align + ";");
}
String resizerClass;
@@ -837,6 +836,7 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(sheetId + "_header_resizer_" + columnCount);
writer.writeClassAttribute(resizerClass);
+ writer.flush();
writer.write(" ");
writer.endElement(HtmlConstants.DIV);
@@ -845,12 +845,12 @@
if (sorterImage != null) {
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-sheet-header-sort-div");
- writer.writeAttribute(HtmlAttributes.TITLE, sortTitle, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, sortTitle, true);
writer.startElement(HtmlConstants.IMG, null);
- writer.writeAttribute(HtmlAttributes.SRC, sorterImage, null);
- writer.writeAttribute(HtmlAttributes.ALT, "", null);
- writer.writeAttribute(HtmlAttributes.TITLE, sortTitle, null);
+ writer.writeAttribute(HtmlAttributes.SRC, sorterImage, false);
+ writer.writeAttribute(HtmlAttributes.ALT, "", false);
+ writer.writeAttribute(HtmlAttributes.TITLE, sortTitle, true);
writer.endElement(HtmlConstants.IMG);
writer.endElement(HtmlConstants.DIV);
@@ -932,16 +932,16 @@
if (column.getId().equals(sheetState.getSortedColumnId())
&& "right".equals(align)) {
writer.startElement(HtmlConstants.IMG, null);
- writer.writeAttribute(HtmlAttributes.SRC, image1x1, null);
- writer.writeAttribute(HtmlAttributes.ALT, "", null);
- writer.writeAttribute(HtmlAttributes.WIDTH, Integer.toString(sortMarkerWidth), null);
- writer.writeAttribute(HtmlAttributes.HEIGHT, "1", null);
+ writer.writeAttribute(HtmlAttributes.SRC, image1x1, false);
+ writer.writeAttribute(HtmlAttributes.ALT, "", false);
+ writer.writeAttribute(HtmlAttributes.WIDTH, sortMarkerWidth);
+ writer.writeAttribute(HtmlAttributes.HEIGHT, 1);
writer.endElement(HtmlConstants.IMG);
}
} else {
writer.startElement(HtmlConstants.IMG, null);
- writer.writeAttribute(HtmlAttributes.SRC, image1x1, null);
- writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.SRC, image1x1, false);
+ writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.endElement(HtmlConstants.IMG);
}
}
@@ -1065,7 +1065,7 @@
writer.writeAttribute(HtmlAttributes.HREF, "javascript: tobagoSheetSetPagerPage('"
+ id + "', '" + skip + hrefPostfix, null);
}
- writer.writeText("", null);
+ writer.flush();
writer.write(str);
writer.endElement(type);
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Sat May 12 06:03:42 2007
@@ -122,8 +122,8 @@
TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.INPUT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
- writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(activeIndex), null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
+ writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(activeIndex), false);
writer.writeNameAttribute(hiddenId);
writer.writeIdAttribute(hiddenId);
writer.endElement(HtmlConstants.INPUT);
@@ -214,30 +214,30 @@
int virtualTab, HtmlStyleMap oStyle, String switchType, String image1x1)
throws IOException {
writer.startElement(HtmlConstants.TABLE, null);
- writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
- writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
+ writer.writeAttribute(HtmlAttributes.BORDER, 0);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
final String clientId = component.getClientId(facesContext);
writer.writeIdAttribute(clientId + '.' + virtualTab);
if (oStyle != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, oStyle, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, oStyle.toString(), false);
}
writer.startElement(HtmlConstants.TR, null);
- writer.writeAttribute(HtmlAttributes.VALIGN, "bottom", null);
+ writer.writeAttribute(HtmlAttributes.VALIGN, "bottom", false);
writer.startElement(HtmlConstants.TD, null);
writer.startElement(HtmlConstants.TABLE, component);
- writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
- writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
- writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE_HEADER);
+ writer.writeAttribute(HtmlAttributes.BORDER, 0);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
+ writer.writeStyleAttribute(ATTR_STYLE_HEADER);
writer.startElement(HtmlConstants.TR, null);
- writer.writeAttribute(HtmlAttributes.VALIGN, "bottom", null);
+ writer.writeAttribute(HtmlAttributes.VALIGN, "bottom", false);
UIPanelBase activeTab = null;
@@ -275,7 +275,7 @@
writer.startElement(HtmlConstants.TD, tab);
writer.writeIdAttribute(tab.getClientId(facesContext));
- writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute(outerClass);
@@ -288,12 +288,12 @@
String tabId = clientId + "." + virtualTab + SUBCOMPONENT_SEP + index;
writer.writeIdAttribute(tabId);
if (onclick != null) {
- writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, true);
}
if (label.getText() != null) {
HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
} else {
- writer.writeText(Integer.toString(index+1), null);
+ writer.writeText(Integer.toString(index+1));
}
writer.endElement(HtmlConstants.SPAN);
@@ -314,14 +314,14 @@
}
writer.startElement(HtmlConstants.TD, null);
- writer.writeAttribute(HtmlAttributes.WIDTH, "100%", null);
+ writer.writeAttribute(HtmlAttributes.WIDTH, "100%", false);
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-tab-fulfill");
writer.startElement(HtmlConstants.IMG, null);
- writer.writeAttribute(HtmlAttributes.SRC, image1x1, null);
- writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.SRC, image1x1, false);
+ writer.writeAttribute(HtmlAttributes.ALT, "", false);
writer.endElement(HtmlConstants.IMG);
writer.endElement(HtmlConstants.DIV);
@@ -345,8 +345,8 @@
writer.startElement(HtmlConstants.TR, null);
writer.startElement(HtmlConstants.TD, null);
writer.writeClassAttribute("tobago-tab-content");
- writer.writeAttribute(HtmlAttributes.STYLE, bodyStyle, null);
- writer.writeText("", null);
+ writer.writeStyleAttribute(bodyStyle);
+ writer.flush();
RenderUtil.encodeChildren(facesContext, activeTab);
writer.endElement(HtmlConstants.TD);
writer.endElement(HtmlConstants.TR);
@@ -356,7 +356,7 @@
AjaxUtils.checkParamValidity(context, component, UITabGroup.class);
renderTabGroupView(context,
- (TobagoResponseWriter) context.getResponseWriter(),
+ HtmlRendererUtil.getTobagoResponseWriter(context),
(UITabGroup) component,
ensureRenderedActiveIndex(context, (UITabGroup) component),
(HtmlStyleMap) component.getAttributes().get(ATTR_STYLE),
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java Sat May 12 06:03:42 2007
@@ -25,7 +25,6 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_READONLY;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ROWS;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
@@ -57,13 +56,13 @@
writer.writeIdAttribute(clientId);
writer.writeAttribute(HtmlAttributes.ROWS, null, ATTR_ROWS);
if (title != null) {
- writer.writeAttribute(HtmlAttributes.TITLE, title, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
writer.writeAttribute(HtmlAttributes.READONLY,
ComponentUtil.getBooleanAttribute(input, ATTR_READONLY));
writer.writeAttribute(HtmlAttributes.DISABLED,
ComponentUtil.getBooleanAttribute(input, ATTR_DISABLED));
- writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+ writer.writeStyleAttribute();
writer.writeClassAttribute();
if (onchange != null) {
writer.writeAttribute(HtmlAttributes.ONCHANGE, onchange, null);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java Sat May 12 06:03:42 2007
@@ -126,7 +126,7 @@
writer.writeClassAttribute();
writer.startElement(HtmlConstants.DIV, input);
- writer.writeAttribute(HtmlAttributes.ID, idPrefix + "borderDiv", null);
+ writer.writeAttribute(HtmlAttributes.ID, idPrefix + "borderDiv", false);
writer.writeClassAttribute("tobago-time-borderDiv"
+ (hasSeconds ? " tobago-time-borderDiv-seconds" : ""));
@@ -180,7 +180,7 @@
writer.startElement(HtmlConstants.INPUT, input);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeIdAttribute(id + ":converterPattern");
- writer.writeAttribute(HtmlAttributes.VALUE, converterPattern, null);
+ writer.writeAttribute(HtmlAttributes.VALUE, converterPattern, true);
writer.endElement(HtmlConstants.INPUT);
writer.startElement(HtmlConstants.INPUT, input);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java Sat May 12 06:03:42 2007
@@ -31,7 +31,6 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL_POSITION;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_MENU_POPUP;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_MENU_POPUP_TYPE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SUPPPRESS_TOOLBAR_CONTAINER;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
@@ -91,7 +90,7 @@
writer.startElement(HtmlConstants.DIV, toolbar);
writer.writeIdAttribute(toolbar.getClientId(facesContext));
writer.writeClassAttribute();
- writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+ writer.writeStyleAttribute();
writer.startElement(HtmlConstants.DIV, toolbar);
boolean right = false;
if (toolbar instanceof UIToolBar) {
@@ -168,7 +167,7 @@
String onclick = createOnClick(facesContext, command);
- List<SelectItem> items;
+ List<SelectItem> items;
UIMenuSelectOne radio = (UIMenuSelectOne) command.getFacet(FACET_ITEMS);
if (radio == null) {
@@ -308,10 +307,10 @@
writer.writeAttribute(HtmlAttributes.ONCLICK, onClick, null);
}
writer.startElement(HtmlConstants.TABLE, null);
- writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
- writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
- writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
+ writer.writeAttribute(HtmlAttributes.BORDER, 0);
writer.writeClassAttribute(tableClasses);
writer.startElement(HtmlConstants.TR, null);
@@ -322,8 +321,8 @@
iconName != null ? iconName : "image/1x1.gif", graphicId);
writer.startElement(HtmlConstants.TD, command);
- writer.writeAttribute(HtmlAttributes.ALIGN, "center", null);
- writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "center", false);
+ writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
boolean render1pxImage = (iconName == null
&& (!ToolBarTag.LABEL_BOTTOM.equals(labelPosition)
@@ -333,7 +332,7 @@
&& label.getText() != null)
|| popupMenu != null)
&& !render1pxImage) {
- writer.writeAttribute(HtmlAttributes.STYLE, "padding-right: 3px;", null);
+ writer.writeStyleAttribute("padding-right: 3px;");
// TODO: make this '3px' configurable
}
@@ -345,13 +344,13 @@
}
writer.startElement(HtmlConstants.IMG, command);
writer.writeIdAttribute(graphicId);
- writer.writeAttribute(HtmlAttributes.SRC, image, null);
- writer.writeAttribute(HtmlAttributes.ALT, "", null);
- writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
- writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.SRC, image, false);
+ writer.writeAttribute(HtmlAttributes.ALT, "", false);
+ writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
+ writer.writeAttribute(HtmlAttributes.BORDER, 0);
writer.writeClassAttribute(className);
if (render1pxImage) {
- writer.writeAttribute(HtmlAttributes.STYLE, "width: 1px;", null);
+ writer.writeStyleAttribute("width: 1px;");
}
writer.endElement(HtmlConstants.IMG);
@@ -375,9 +374,9 @@
if (!ToolBarTag.LABEL_OFF.equals(labelPosition)) {
writer.startElement(HtmlConstants.TD, null);
writer.writeClassAttribute("tobago-toolbar-label-td");
- writer.writeAttribute(HtmlAttributes.ALIGN, "center", null);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "center", false);
if (popupMenu != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, "padding-right: 3px;", null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "padding-right: 3px;", false);
// TODO: make this '3px' configurable
}
if (label.getText() != null) {
@@ -476,10 +475,10 @@
throws IOException {
writer.startElement(HtmlConstants.A, command);
writer.writeClassAttribute("tobago-toolBar-button-link" + (disabled ? "tobago-toolBar-button-link-disabled" : ""));
- writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
if (!disabled) {
- writer.writeAttribute(HtmlAttributes.HREF, "#", null);
- writer.writeAttribute(HtmlAttributes.ONFOCUS, "Tobago.toolbarFocus(this, event)", null);
+ writer.writeAttribute(HtmlAttributes.HREF, "#", false);
+ writer.writeAttribute(HtmlAttributes.ONFOCUS, "Tobago.toolbarFocus(this, event)", false);
if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
&& !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
@@ -499,7 +498,7 @@
throws IOException {
writer.startElement(HtmlConstants.TD, null);
if (labelBottom) {
- writer.writeAttribute(HtmlAttributes.ROWSPAN, "2", null);
+ writer.writeAttribute(HtmlAttributes.ROWSPAN, 2);
}
if (popupMenu != null) {
@@ -510,7 +509,7 @@
command.getClientId(facesContext) + SUBCOMPONENT_SEP + "popup");
writer.writeClassAttribute("tobago-toolBar-button-menu");
writer.startElement(HtmlConstants.IMG, null);
- writer.writeAttribute(HtmlAttributes.SRC, backgroundImage, null);
+ writer.writeAttribute(HtmlAttributes.SRC, backgroundImage, false);
writer.writeClassAttribute("tobago-toolBar-button-menu-background-image");
writer.endElement(HtmlConstants.IMG);
writer.endElement(HtmlConstants.DIV);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java Sat May 12 06:03:42 2007
@@ -21,7 +21,6 @@
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_NAME;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTABLE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
import org.apache.myfaces.tobago.component.UITreeListbox;
@@ -63,7 +62,7 @@
String treeId = tree.getClientId(facesContext);
TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
-
+
final boolean siblingMode
= "siblingLeafOnly".equals(tree.getAttributes().get(ATTR_SELECTABLE));
@@ -73,8 +72,8 @@
writer.startElement(HtmlConstants.SELECT, component);
writer.writeIdAttribute(listboxId);
writer.writeClassAttribute(className);
- writer.writeAttribute(HtmlAttributes.STYLE , null, ATTR_STYLE);
- writer.writeAttribute(HtmlAttributes.SIZE, "2", null);
+ writer.writeStyleAttribute();
+ writer.writeAttribute(HtmlAttributes.SIZE, 2);
if (siblingMode) {
writer.writeAttribute(HtmlAttributes.ONCHANGE, onChange, null);
} else {
@@ -91,15 +90,15 @@
writer.startElement(HtmlConstants.OPTION, treeNode);
// writer.writeAttribute(HtmlAttributes.ONCLICK, "tbgTreeListboxClick(this, '" + treeId + "')", null);
- writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(i), null);
+ writer.writeAttribute(HtmlAttributes.VALUE, i);
if (treeNode.equals(tree.getSelectedNode(level))
|| tree.isSelectedNode(node)) {
writer.writeAttribute(HtmlAttributes.SELECTED, true);
}
- writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
writer.writeText(treeNode.getAttributes().get(ATTR_NAME), null);
if (node.getChildCount() > 0) {
- writer.writeText(" \u2192", null);
+ writer.writeText(" \u2192");
}
writer.endElement(HtmlConstants.OPTION);
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java Sat May 12 06:03:42 2007
@@ -24,7 +24,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.component.UITreeListbox;
@@ -67,7 +66,7 @@
TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, tree);
writer.writeClassAttribute();
- writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+ writer.writeStyleAttribute();
StringBuilder value = new StringBuilder(";");
List<UITreeOldNode> expandPath = tree.getExpandPath();
@@ -77,10 +76,10 @@
}
writer.startElement(HtmlConstants.INPUT, tree);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
- writer.writeAttribute(HtmlAttributes.VALUE, value, null);
+ writer.writeAttribute(HtmlAttributes.VALUE, value.toString(), true);
writer.endElement(HtmlConstants.INPUT);
@@ -91,10 +90,10 @@
value.append(";");
}
writer.startElement(HtmlConstants.INPUT, tree);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + UITreeListbox.SELECT_STATE);
writer.writeIdAttribute(clientId + UITreeListbox.SELECT_STATE);
- writer.writeAttribute(HtmlAttributes.VALUE, value, null);
+ writer.writeAttribute(HtmlAttributes.VALUE, value.toString(), true);
writer.endElement(HtmlConstants.INPUT);
String scriptText = createJavascript(facesContext, clientId, root);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java Sat May 12 06:03:42 2007
@@ -30,11 +30,11 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
import java.io.IOException;
import java.io.StringWriter;
import java.util.List;
@@ -113,28 +113,28 @@
TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, tree);
writer.writeClassAttribute();
- writer.writeAttribute(HtmlAttributes.STYLE, null, TobagoConstants.ATTR_STYLE);
+ writer.writeStyleAttribute();
writer.startElement(HtmlConstants.INPUT, tree);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
- writer.writeAttribute(HtmlAttributes.VALUE, ";", null);
+ writer.writeAttribute(HtmlAttributes.VALUE, ";", false);
writer.endElement(HtmlConstants.INPUT);
writer.startElement(HtmlConstants.INPUT, tree);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + UITreeOld.MARKER);
writer.writeIdAttribute(clientId + UITreeOld.MARKER);
- writer.writeAttribute(HtmlAttributes.VALUE, "", null);
+ writer.writeAttribute(HtmlAttributes.VALUE, "", false);
writer.endElement(HtmlConstants.INPUT);
if (isSelectable(tree)) {
writer.startElement(HtmlConstants.INPUT, tree);
- writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + UITreeOld.SELECT_STATE);
writer.writeIdAttribute(clientId + UITreeOld.SELECT_STATE);
- writer.writeAttribute(HtmlAttributes.VALUE, ";", null);
+ writer.writeAttribute(HtmlAttributes.VALUE, ";", false);
writer.endElement(HtmlConstants.INPUT);
}
@@ -157,10 +157,10 @@
// writer.startElement(HtmlConstants.DIV, null);
writer.startElement(HtmlConstants.TABLE, tree);
- writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
- writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
- writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
- writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
+ writer.writeAttribute(HtmlAttributes.BORDER, 0);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
writer.writeClassAttribute();
writer.startElement(HtmlConstants.TR, null);
writer.startElement(HtmlConstants.TD, null);
@@ -244,7 +244,7 @@
}
protected String getNodesAsJavascript(FacesContext facesContext, UITreeOldNode root) throws IOException {
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ ResponseWriter writer = facesContext.getResponseWriter();
StringWriter stringWriter = new StringWriter();
facesContext.setResponseWriter(writer.cloneWithWriter(stringWriter));
RenderUtil.encode(facesContext, root);
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Sat May 12 06:03:42 2007
@@ -77,7 +77,7 @@
writer.writeClassAttribute();
writer.writeIdAttribute(clientId);
if (style != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, style, null);
+ writer.writeStyleAttribute(style);
}
writer.writeJavascript("Tobago.addAjaxComponent(\"" + clientId + "\")");
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java Sat May 12 06:03:42 2007
@@ -27,7 +27,6 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_BODY;
import org.apache.myfaces.tobago.component.UIPanelBase;
import org.apache.myfaces.tobago.renderkit.RenderUtil;
-import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
@@ -50,13 +49,13 @@
writer.startElement(HtmlConstants.TR, null);
writer.startElement(HtmlConstants.TD, null);
if (bodyStyle != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, bodyStyle, null);
+ writer.writeStyleAttribute(bodyStyle);
}
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-tab-shadow");
if (bodyStyle != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, bodyStyle, null);
+ writer.writeStyleAttribute(bodyStyle);
}
writer.startElement(HtmlConstants.DIV, null);
@@ -64,11 +63,10 @@
Integer height = HtmlRendererUtil.getStyleAttributeIntValue(bodyStyle, "height");
if (height != null) {
- writer.writeAttribute(HtmlAttributes.STYLE,
- MessageFormat.format("height: {0}px; overflow: auto;", height - 1), null);
+ writer.writeStyleAttribute(MessageFormat.format("height: {0}px; overflow: auto;", height - 1));
}
- writer.writeText("", null);
+ writer.flush();
RenderUtil.encodeChildren(facesContext, activeTab);
writer.endElement(HtmlConstants.DIV);
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java?view=diff&rev=537407&r1=537406&r2=537407
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java Sat May 12 06:03:42 2007
@@ -19,10 +19,10 @@
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
import java.io.IOException;
public class PageRenderer extends PageRendererBase {
@@ -46,10 +46,7 @@
UIPage page = (UIPage) component;
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
-
- // reset responseWriter and render page
- facesContext.setResponseWriter(writer);
+ ResponseWriter writer = facesContext.getResponseWriter();
writer.write(DOCTYPE);
writer.write('\n');