You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2007/05/11 17:20:54 UTC
svn commit: r537208 [2/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/renderkit/html/
core/src/main/java/org/apache/myfaces/tobago/webapp/
sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/...
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java?view=diff&rev=537208&r1=537207&r2=537208
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java Fri May 11 08:20:51 2007
@@ -33,7 +33,7 @@
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.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectOne;
@@ -51,7 +51,7 @@
}
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
UISelectOne component = (UISelectOne) uiComponent;
List<SelectItem> items = ComponentUtil.getSelectItems(component);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -34,7 +34,7 @@
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.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectOne;
@@ -73,7 +73,7 @@
}
public void encodeEnd(FacesContext facesContext, UIComponent input) throws IOException {
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
UISelectOne component = (UISelectOne) input;
List<SelectItem> items = ComponentUtil.getSelectItems(component);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -35,7 +35,7 @@
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.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
@@ -78,8 +78,7 @@
boolean inline = ComponentUtil.getBooleanAttribute(component, ATTR_INLINE);
String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, component);
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
if (!inline) {
writer.startElement(HtmlConstants.TABLE, component);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -86,7 +86,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.util.StringUtil;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.application.Application;
import javax.faces.component.UIColumn;
@@ -94,7 +94,6 @@
import javax.faces.component.UIPanel;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -129,8 +128,7 @@
final String sheetId = data.getClientId(facesContext);
HtmlStyleMap sheetStyle = (HtmlStyleMap) data.getAttributes().get(ATTR_STYLE);
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
// Outher sheet div
writer.startElement(HtmlConstants.DIV, null);
@@ -179,8 +177,7 @@
}
private void renderSheet(FacesContext facesContext, UIData data) throws IOException {
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
UIViewRoot viewRoot = facesContext.getViewRoot();
String contextPath = facesContext.getExternalContext().getRequestContextPath();
@@ -738,7 +735,7 @@
String image = ResourceManagerUtil.getImageWithPath(facesContext,
"image/sheet" + command.getToken() + (disabled ? "Disabled" : "") + ".gif");
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.IMG, null);
writer.writeIdAttribute(data.getClientId(facesContext)
+ SUBCOMPONENT_SEP + "pagingPages" + SUBCOMPONENT_SEP + command.getToken());
@@ -756,7 +753,7 @@
}
private void renderColumnHeader(FacesContext facesContext,
- TobagoResponseWriterImpl writer, UIData component,
+ TobagoResponseWriter writer, UIData component,
int columnCount, UIColumn column, String ascending, String descending,
String image1x1, int sortMarkerWidth) throws IOException {
String sheetId = component.getClientId(facesContext);
@@ -866,7 +863,7 @@
protected void renderColumnSelectorHeader(FacesContext facesContext,
- TobagoResponseWriterImpl writer, UIData component, UIColumn column)
+ TobagoResponseWriter writer, UIData component, UIColumn column)
throws IOException {
UIPanel menu = (UIPanel) column.getFacet(FACET_MENUPOPUP);
if (menu == null) {
@@ -923,7 +920,7 @@
}
private void renderColumnHeaderLabel(FacesContext facesContext,
- ResponseWriter writer, UIColumn column,
+ TobagoResponseWriter writer, UIColumn column,
int sortMarkerWidth, String align,
String image1x1) throws IOException {
String label
@@ -950,7 +947,7 @@
}
private void writeDirectPagingLinks(
- TobagoResponseWriterImpl writer, FacesContext facesContext, Application application, UIData data)
+ TobagoResponseWriter writer, FacesContext facesContext, Application application, UIData data)
throws IOException {
UICommand pagerCommand = (UICommand) data.getFacet(FACET_PAGER_PAGE);
if (pagerCommand == null) {
@@ -1057,7 +1054,7 @@
return link;
}
- private void writeLinkElement(TobagoResponseWriterImpl writer, String str, String skip,
+ private void writeLinkElement(TobagoResponseWriter writer, String str, String skip,
String id, String hrefPostfix, boolean makeLink)
throws IOException {
String type = makeLink ? HtmlConstants.A : HtmlConstants.SPAN;
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -54,7 +54,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.util.AccessKeyMap;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -120,9 +120,7 @@
}
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
-
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(activeIndex), null);
@@ -212,7 +210,7 @@
}
private void renderTabGroupView(
- FacesContext facesContext, TobagoResponseWriterImpl writer, UITabGroup component,
+ FacesContext facesContext, TobagoResponseWriter writer, UITabGroup component,
int virtualTab, HtmlStyleMap oStyle, String switchType, String image1x1)
throws IOException {
writer.startElement(HtmlConstants.TABLE, null);
@@ -339,8 +337,8 @@
writer.endElement(HtmlConstants.TABLE);
}
- protected void encodeContent(TobagoResponseWriterImpl writer,
- FacesContext facesContext, UIPanelBase activeTab) throws IOException {
+ protected void encodeContent(TobagoResponseWriter writer, FacesContext facesContext, UIPanelBase activeTab)
+ throws IOException {
HtmlStyleMap bodyStyle = (HtmlStyleMap)
activeTab.getParent().getAttributes().get(ATTR_STYLE_BODY);
@@ -358,7 +356,7 @@
AjaxUtils.checkParamValidity(context, component, UITabGroup.class);
renderTabGroupView(context,
- (TobagoResponseWriterImpl) context.getResponseWriter(),
+ (TobagoResponseWriter) context.getResponseWriter(),
(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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -32,7 +32,7 @@
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.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -51,9 +51,7 @@
String clientId = input.getClientId(facesContext);
String onchange = HtmlUtils.generateOnchange(input, facesContext);
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
-
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.TEXTAREA, input);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -36,7 +36,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.util.DateFormatUtils;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -121,8 +121,7 @@
String id = input.getClientId(facesContext);
final String idPrefix = id + SUBCOMPONENT_SEP;
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, input);
writer.writeClassAttribute();
@@ -201,14 +200,14 @@
writer.endElement(HtmlConstants.DIV);
}
- private void writeInputSeparator(TobagoResponseWriterImpl writer, String sep) throws IOException {
+ private void writeInputSeparator(TobagoResponseWriter writer, String sep) throws IOException {
writer.startElement(HtmlConstants.SPAN, null);
writer.writeClassAttribute("tobago-time-sep");
- writer.writeText(sep, null);
+ writer.writeText(sep);
writer.endElement(HtmlConstants.SPAN);
}
- private void writeInput(TobagoResponseWriterImpl writer, String id, String hour, boolean hourMode)
+ private void writeInput(TobagoResponseWriter writer, String id, String hour, boolean hourMode)
throws IOException {
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "text", false);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -58,7 +58,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.taglib.component.ToolBarTag;
import org.apache.myfaces.tobago.util.AccessKeyMap;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
@@ -82,10 +82,8 @@
UIComponent uiComponent) throws IOException {
UIPanel toolbar = (UIPanel) uiComponent;
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
- boolean suppressContainer = ComponentUtil.getBooleanAttribute(toolbar,
- ATTR_SUPPPRESS_TOOLBAR_CONTAINER);
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ boolean suppressContainer = ComponentUtil.getBooleanAttribute(toolbar, ATTR_SUPPPRESS_TOOLBAR_CONTAINER);
if (!suppressContainer) {
setToolBarHeight(facesContext, uiComponent);
@@ -142,7 +140,7 @@
}
private void renderToolbarCommand(FacesContext facesContext,
- final UICommand command, TobagoResponseWriterImpl writer, boolean boxFacet,
+ final UICommand command, TobagoResponseWriter writer, boolean boxFacet,
boolean addExtraHoverClass)
throws IOException {
if (command instanceof UISelectBooleanCommand) {
@@ -165,7 +163,7 @@
}
private void renderSelectOne(FacesContext facesContext, UICommand command,
- TobagoResponseWriterImpl writer, boolean boxFacet, boolean addExtraHoverClass)
+ TobagoResponseWriter writer, boolean boxFacet, boolean addExtraHoverClass)
throws IOException {
String onclick = createOnClick(facesContext, command);
@@ -234,7 +232,7 @@
}
private void renderSelectBoolean(FacesContext facesContext, UICommand command,
- TobagoResponseWriterImpl writer, boolean boxFacet, boolean addExtraHoverClass)
+ TobagoResponseWriter writer, boolean boxFacet, boolean addExtraHoverClass)
throws IOException {
UIComponent checkbox = command.getFacet(FACET_ITEMS);
@@ -257,7 +255,7 @@
}
private void renderToolbarButton(
- FacesContext facesContext, final UICommand command, TobagoResponseWriterImpl writer, boolean boxFacet,
+ FacesContext facesContext, final UICommand command, TobagoResponseWriter writer, boolean boxFacet,
boolean addExtraHoverClass, boolean selected, String onClick)
throws IOException {
if (!command.isRendered()) {
@@ -472,8 +470,8 @@
return contextPath + image;
}
- private void renderAnchorBegin(FacesContext facesContext,
- TobagoResponseWriterImpl writer, final UICommand command,
+ private void renderAnchorBegin(
+ FacesContext facesContext, TobagoResponseWriter writer, final UICommand command,
final LabelWithAccessKey label, final boolean disabled)
throws IOException {
writer.startElement(HtmlConstants.A, command);
@@ -496,7 +494,7 @@
}
private void renderPopupTd(FacesContext facesContext,
- TobagoResponseWriterImpl writer, UIComponent command, UIComponent popupMenu,
+ TobagoResponseWriter writer, UIComponent command, UIComponent popupMenu,
boolean labelBottom)
throws IOException {
writer.startElement(HtmlConstants.TD, null);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -30,7 +30,8 @@
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -61,8 +62,8 @@
}
String treeId = tree.getClientId(facesContext);
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
-
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+
final boolean siblingMode
= "siblingLeafOnly".equals(tree.getAttributes().get(ATTR_SELECTABLE));
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -34,7 +34,7 @@
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.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -64,8 +64,7 @@
if (LOG.isDebugEnabled()) {
page.getOnloadScripts().add("tbgTreeStates('" + clientId + "')");
}
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, tree);
writer.writeClassAttribute();
writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -29,6 +29,7 @@
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.webapp.TobagoResponseWriter;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.NamingContainer;
@@ -109,8 +110,7 @@
String clientId = tree.getClientId(facesContext);
UITreeOldNode root = tree.getRoot();
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
-
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, tree);
writer.writeClassAttribute();
writer.writeAttribute(HtmlAttributes.STYLE, null, TobagoConstants.ATTR_STYLE);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -42,12 +42,11 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.taglib.component.ToolBarTag;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
import javax.faces.component.UIPanel;
import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
import java.io.IOException;
import java.util.Map;
@@ -63,8 +62,7 @@
HtmlRendererUtil.prepareInnerStyle(component);
- TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
-
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
HtmlStyleMap style = (HtmlStyleMap) component.getAttributes().get(ATTR_STYLE);
if (style != null) {
@@ -87,7 +85,7 @@
}
private void encodeBeginInner(FacesContext facesContext,
- TobagoResponseWriterImpl writer, UIComponent component) throws IOException {
+ TobagoResponseWriter writer, UIComponent component) throws IOException {
renderBoxHeader(facesContext, writer, component);
@@ -102,12 +100,12 @@
contentInnerClasses.addClass("box", "content-inner");
contentInnerClasses.addMarkupClass(component, "box", "content-inner");
writer.writeClassAttribute(contentInnerClasses);
- writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE_INNER);
+ writer.writeAttributeFromComponent(HtmlAttributes.STYLE, ATTR_STYLE_INNER);
}
protected void renderBoxHeader(FacesContext facesContext,
- TobagoResponseWriterImpl writer, UIComponent component) throws IOException {
+ TobagoResponseWriter writer, UIComponent component) throws IOException {
writer.startElement(HtmlConstants.DIV, component);
StyleClasses headerClasses = new StyleClasses();
@@ -122,7 +120,7 @@
if (label != null) {
RenderUtil.encode(facesContext, label);
} else if (labelString != null) {
- writer.writeText(labelString, null);
+ writer.writeText(labelString);
}
writer.endElement(HtmlConstants.SPAN);
@@ -135,20 +133,20 @@
public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
- ResponseWriter writer = facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
encodeEndInner(writer);
writer.endElement(HtmlConstants.DIV);
}
- private void encodeEndInner(ResponseWriter writer) throws IOException {
+ private void encodeEndInner(TobagoResponseWriter writer) throws IOException {
writer.endElement(HtmlConstants.DIV);
writer.endElement(HtmlConstants.DIV);
}
- protected void renderToolbar(FacesContext facesContext,
- TobagoResponseWriterImpl writer, UIPanel toolbar) throws IOException {
+ protected void renderToolbar(
+ FacesContext facesContext, TobagoResponseWriter writer, UIPanel toolbar) throws IOException {
final Map attributes = toolbar.getAttributes();
String className = "tobago-box-header-toolbar-div";
if (ToolBarTag.LABEL_OFF.equals(attributes.get(ATTR_LABEL_POSITION))) {
@@ -169,8 +167,7 @@
public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
AjaxUtils.checkParamValidity(facesContext, component, UIPanel.class);
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
encodeBeginInner(facesContext, writer, component);
component.encodeChildren(facesContext);
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -31,7 +31,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.context.FacesContext;
import java.io.IOException;
@@ -42,7 +42,7 @@
private static final Log LOG = LogFactory.getLog(TabGroupRenderer.class);
- protected void encodeContent(TobagoResponseWriterImpl writer,
+ protected void encodeContent(TobagoResponseWriter writer,
FacesContext facesContext, UIPanelBase activeTab) throws IOException {
HtmlStyleMap bodyStyle = (HtmlStyleMap)
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=537208&r1=537207&r2=537208
==============================================================================
--- 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 Fri May 11 08:20:51 2007
@@ -46,8 +46,7 @@
UIPage page = (UIPage) component;
- TobagoResponseWriterImpl writer
- = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
// reset responseWriter and render page
facesContext.setResponseWriter(writer);