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/10 09:20:37 UTC
svn commit: r536764 [2/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/renderkit/
core/src/main/java/org/apache/myfaces/tobago/renderkit/html/
core/src/main/java/org/apache/myfaces/tobago/webapp/
core/src/test/java/org/apach...
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?view=diff&rev=536764&r1=536763&r2=536764
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -77,8 +77,8 @@
UISelectBoolean component = (UISelectBoolean) uiComponent;
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
UIComponent label = ComponentUtil.provideLabel(facesContext, component);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java?view=diff&rev=536764&r1=536763&r2=536764
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
@@ -54,8 +54,8 @@
List<SelectItem> items = ComponentUtil.getItemsToRender(component);
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
Object[] values = component.getSelectedValues();
if (LOG.isDebugEnabled()) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java?view=diff&rev=536764&r1=536763&r2=536764
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectMany;
@@ -85,8 +85,8 @@
LOG.debug("items.size() = '" + items.size() + "'");
}
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, component);
writer.startElement(HtmlConstants.SELECT, component);
String clientId = component.getClientId(facesContext);
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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectOne;
@@ -51,7 +51,7 @@
}
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
- TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectOne;
@@ -73,7 +73,7 @@
}
public void encodeEnd(FacesContext facesContext, UIComponent input) throws IOException {
- TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
@@ -78,8 +78,8 @@
boolean inline = ComponentUtil.getBooleanAttribute(component, ATTR_INLINE);
String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, component);
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.application.Application;
import javax.faces.component.UIColumn;
@@ -129,8 +129,8 @@
final String sheetId = data.getClientId(facesContext);
HtmlStyleMap sheetStyle = (HtmlStyleMap) data.getAttributes().get(ATTR_STYLE);
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
// Outher sheet div
writer.startElement(HtmlConstants.DIV, null);
@@ -179,8 +179,8 @@
}
private void renderSheet(FacesContext facesContext, UIData data) throws IOException {
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
UIViewRoot viewRoot = facesContext.getViewRoot();
String contextPath = facesContext.getExternalContext().getRequestContextPath();
@@ -738,7 +738,7 @@
String image = ResourceManagerUtil.getImageWithPath(facesContext,
"image/sheet" + command.getToken() + (disabled ? "Disabled" : "") + ".gif");
- TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
writer.startElement(HtmlConstants.IMG, null);
writer.writeIdAttribute(data.getClientId(facesContext)
+ SUBCOMPONENT_SEP + "pagingPages" + SUBCOMPONENT_SEP + command.getToken());
@@ -756,7 +756,7 @@
}
private void renderColumnHeader(FacesContext facesContext,
- TobagoResponseWriter writer, UIData component,
+ TobagoResponseWriterImpl writer, UIData component,
int columnCount, UIColumn column, String ascending, String descending,
String image1x1, int sortMarkerWidth) throws IOException {
String sheetId = component.getClientId(facesContext);
@@ -866,7 +866,7 @@
protected void renderColumnSelectorHeader(FacesContext facesContext,
- TobagoResponseWriter writer, UIData component, UIColumn column)
+ TobagoResponseWriterImpl writer, UIData component, UIColumn column)
throws IOException {
UIPanel menu = (UIPanel) column.getFacet(FACET_MENUPOPUP);
if (menu == null) {
@@ -950,7 +950,7 @@
}
private void writeDirectPagingLinks(
- TobagoResponseWriter writer, FacesContext facesContext, Application application, UIData data)
+ TobagoResponseWriterImpl writer, FacesContext facesContext, Application application, UIData data)
throws IOException {
UICommand pagerCommand = (UICommand) data.getFacet(FACET_PAGER_PAGE);
if (pagerCommand == null) {
@@ -1057,7 +1057,7 @@
return link;
}
- private void writeLinkElement(TobagoResponseWriter writer, String str, String skip,
+ private void writeLinkElement(TobagoResponseWriterImpl 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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 2007
@@ -27,12 +27,12 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_HEIGHT;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_WIDTH;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTED_INDEX;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_BODY;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_HEADER;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTED_INDEX;
import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
import org.apache.myfaces.tobago.component.ComponentUtil;
@@ -46,22 +46,22 @@
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.event.TabChangeEvent;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
-import org.apache.myfaces.tobago.renderkit.RenderUtil;
import org.apache.myfaces.tobago.renderkit.LayoutInformationProvider;
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
-import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+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;
import org.apache.myfaces.tobago.util.AccessKeyMap;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
import java.io.IOException;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
public class TabGroupRenderer extends LayoutableRendererBase implements AjaxRenderer {
@@ -120,8 +120,8 @@
}
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
@@ -212,7 +212,7 @@
}
private void renderTabGroupView(
- FacesContext facesContext, TobagoResponseWriter writer, UITabGroup component,
+ FacesContext facesContext, TobagoResponseWriterImpl writer, UITabGroup component,
int virtualTab, HtmlStyleMap oStyle, String switchType, String image1x1)
throws IOException {
writer.startElement(HtmlConstants.TABLE, null);
@@ -339,7 +339,7 @@
writer.endElement(HtmlConstants.TABLE);
}
- protected void encodeContent(TobagoResponseWriter writer,
+ protected void encodeContent(TobagoResponseWriterImpl writer,
FacesContext facesContext, UIPanelBase activeTab) throws IOException {
HtmlStyleMap bodyStyle = (HtmlStyleMap)
@@ -358,7 +358,7 @@
AjaxUtils.checkParamValidity(context, component, UITabGroup.class);
renderTabGroupView(context,
- (TobagoResponseWriter) context.getResponseWriter(),
+ (TobagoResponseWriterImpl) 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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -51,8 +51,8 @@
String clientId = input.getClientId(facesContext);
String onchange = HtmlUtils.generateOnchange(input, facesContext);
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
writer.startElement(HtmlConstants.TEXTAREA, input);
writer.writeNameAttribute(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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -121,8 +121,8 @@
String id = input.getClientId(facesContext);
final String idPrefix = id + SUBCOMPONENT_SEP;
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
writer.startElement(HtmlConstants.DIV, input);
writer.writeClassAttribute();
@@ -201,14 +201,14 @@
writer.endElement(HtmlConstants.DIV);
}
- private void writeInputSeparator(TobagoResponseWriter writer, String sep) throws IOException {
+ private void writeInputSeparator(TobagoResponseWriterImpl writer, String sep) throws IOException {
writer.startElement(HtmlConstants.SPAN, null);
writer.writeClassAttribute("tobago-time-sep");
writer.writeText(sep, null);
writer.endElement(HtmlConstants.SPAN);
}
- private void writeInput(TobagoResponseWriter writer, String id, String hour, boolean hourMode)
+ private void writeInput(TobagoResponseWriterImpl 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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UICommand;
import javax.faces.component.UIComponent;
@@ -82,8 +82,8 @@
UIComponent uiComponent) throws IOException {
UIPanel toolbar = (UIPanel) uiComponent;
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
boolean suppressContainer = ComponentUtil.getBooleanAttribute(toolbar,
ATTR_SUPPPRESS_TOOLBAR_CONTAINER);
@@ -142,7 +142,7 @@
}
private void renderToolbarCommand(FacesContext facesContext,
- final UICommand command, TobagoResponseWriter writer, boolean boxFacet,
+ final UICommand command, TobagoResponseWriterImpl writer, boolean boxFacet,
boolean addExtraHoverClass)
throws IOException {
if (command instanceof UISelectBooleanCommand) {
@@ -165,7 +165,7 @@
}
private void renderSelectOne(FacesContext facesContext, UICommand command,
- TobagoResponseWriter writer, boolean boxFacet, boolean addExtraHoverClass)
+ TobagoResponseWriterImpl writer, boolean boxFacet, boolean addExtraHoverClass)
throws IOException {
String onclick = createOnClick(facesContext, command);
@@ -234,7 +234,7 @@
}
private void renderSelectBoolean(FacesContext facesContext, UICommand command,
- TobagoResponseWriter writer, boolean boxFacet, boolean addExtraHoverClass)
+ TobagoResponseWriterImpl writer, boolean boxFacet, boolean addExtraHoverClass)
throws IOException {
UIComponent checkbox = command.getFacet(FACET_ITEMS);
@@ -257,7 +257,7 @@
}
private void renderToolbarButton(
- FacesContext facesContext, final UICommand command, TobagoResponseWriter writer, boolean boxFacet,
+ FacesContext facesContext, final UICommand command, TobagoResponseWriterImpl writer, boolean boxFacet,
boolean addExtraHoverClass, boolean selected, String onClick)
throws IOException {
if (!command.isRendered()) {
@@ -473,7 +473,7 @@
}
private void renderAnchorBegin(FacesContext facesContext,
- TobagoResponseWriter writer, final UICommand command,
+ TobagoResponseWriterImpl writer, final UICommand command,
final LabelWithAccessKey label, final boolean disabled)
throws IOException {
writer.startElement(HtmlConstants.A, command);
@@ -496,7 +496,7 @@
}
private void renderPopupTd(FacesContext facesContext,
- TobagoResponseWriter writer, UIComponent command, UIComponent popupMenu,
+ TobagoResponseWriterImpl 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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 2007
@@ -17,20 +17,20 @@
* limitations under the License.
*/
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.commons.logging.Log;
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;
import org.apache.myfaces.tobago.component.UITreeListboxBox;
import org.apache.myfaces.tobago.component.UITreeOldNode;
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -61,7 +61,7 @@
}
String treeId = tree.getClientId(facesContext);
- TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -64,8 +64,8 @@
if (LOG.isDebugEnabled()) {
page.getOnloadScripts().add("tbgTreeStates('" + clientId + "')");
}
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 2007
@@ -29,7 +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;
import javax.faces.component.UIComponent;
@@ -109,7 +109,7 @@
String clientId = tree.getClientId(facesContext);
UITreeOldNode root = tree.getRoot();
- TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
writer.startElement(HtmlConstants.DIV, tree);
writer.writeClassAttribute();
@@ -244,7 +244,7 @@
}
protected String getNodesAsJavascript(FacesContext facesContext, UITreeOldNode root) throws IOException {
- TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) 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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 2007
@@ -42,7 +42,7 @@
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.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.component.UIPanel;
@@ -63,7 +63,7 @@
HtmlRendererUtil.prepareInnerStyle(component);
- TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
HtmlStyleMap style = (HtmlStyleMap) component.getAttributes().get(ATTR_STYLE);
@@ -87,7 +87,7 @@
}
private void encodeBeginInner(FacesContext facesContext,
- TobagoResponseWriter writer, UIComponent component) throws IOException {
+ TobagoResponseWriterImpl writer, UIComponent component) throws IOException {
renderBoxHeader(facesContext, writer, component);
@@ -107,7 +107,7 @@
protected void renderBoxHeader(FacesContext facesContext,
- TobagoResponseWriter writer, UIComponent component) throws IOException {
+ TobagoResponseWriterImpl writer, UIComponent component) throws IOException {
writer.startElement(HtmlConstants.DIV, component);
StyleClasses headerClasses = new StyleClasses();
@@ -148,7 +148,7 @@
}
protected void renderToolbar(FacesContext facesContext,
- TobagoResponseWriter writer, UIPanel toolbar) throws IOException {
+ TobagoResponseWriterImpl 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 +169,8 @@
public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
AjaxUtils.checkParamValidity(facesContext, component, UIPanel.class);
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 2007
@@ -27,11 +27,11 @@
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.HtmlRendererUtil;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
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;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
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(TobagoResponseWriter writer,
+ protected void encodeContent(TobagoResponseWriterImpl 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=536764&r1=536763&r2=536764
==============================================================================
--- 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 Thu May 10 00:20:32 2007
@@ -19,7 +19,7 @@
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
-import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriterImpl;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -46,8 +46,8 @@
UIPage page = (UIPage) component;
- TobagoResponseWriter writer
- = (TobagoResponseWriter) facesContext.getResponseWriter();
+ TobagoResponseWriterImpl writer
+ = (TobagoResponseWriterImpl) facesContext.getResponseWriter();
// reset responseWriter and render page
facesContext.setResponseWriter(writer);