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 2006/11/07 20:34:51 UTC
svn commit: r472219 [1/2] - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/renderkit/
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/
theme/scarborough/src/main/java/org/apache/m...
Author: bommel
Date: Tue Nov 7 11:34:48 2006
New Revision: 472219
URL: http://svn.apache.org/viewvc?view=rev&rev=472219
Log:
[TOBAGO-174] Changed signature of TobagoRenderer to standard Renderer signature
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxBoxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/InRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SeparatorRenderer.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Tue Nov 7 11:34:48 2006
@@ -60,7 +60,7 @@
LOG.debug("*** begin " + component);
}
try {
- encodeBeginTobago(facesContext, component);
+ super.encodeBegin(facesContext, component);
} catch (IOException e) {
throw e;
} catch (RuntimeException e) {
@@ -86,7 +86,7 @@
LOG.info("UUUUUUUUUUUUUUUUUUUUU UIPage XXXXXXXXXXXXXXXXXXXXXXXXXXXXxx");
}
- encodeChildrenTobago(facesContext, component);
+ super.encodeChildren(facesContext, component);
if (LOG.isDebugEnabled()) {
LOG.debug("* children " + component);
@@ -99,7 +99,7 @@
LOG.debug("*** end " + component);
}
try {
- encodeEndTobago(facesContext, component);
+ super.encodeEnd(facesContext, component);
} catch (IOException e) {
throw e;
} catch (RuntimeException e) {
@@ -257,35 +257,7 @@
}
}
- /**
- * Normally not needed to overrwrite
- * */
- public void encodeBeginTobago(FacesContext facesContext,
- UIComponent component) throws IOException {
- }
-
- public void encodeChildrenTobago(FacesContext facesContext,
- UIComponent component) throws IOException {
- for (Iterator i = component.getChildren().iterator(); i.hasNext();) {
- UIComponent child = (UIComponent) i.next();
- //l
- if (child.isRendered()) {
-// if (ComponentUtil.getBooleanAttribute(
-// child,
-// ATTR_SUPPRESSED)) {
- child.encodeBegin(facesContext);
- if (child.getRendersChildren()) {
- child.encodeChildren(facesContext);
- }
- child.encodeEnd(facesContext);
-// }
- }
- }
- }
-
- public void encodeEndTobago(FacesContext facesContext,
- UIComponent component) throws IOException {
- }
+
protected String getCurrentValue(
FacesContext facesContext, UIComponent component) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/TobagoRenderer.java Tue Nov 7 11:34:48 2006
@@ -22,15 +22,15 @@
public interface TobagoRenderer {
- void encodeBeginTobago(FacesContext facesContext,
+ void encodeBegin(FacesContext facesContext,
UIComponent component)
throws IOException;
- void encodeChildrenTobago(FacesContext facesContext,
+ void encodeChildren(FacesContext facesContext,
UIComponent component)
throws IOException;
- void encodeEndTobago(FacesContext facesContext, UIComponent component)
+ void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException;
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/tag/BoxRenderer.java Tue Nov 7 11:34:48 2006
@@ -31,10 +31,10 @@
public class BoxRenderer extends
org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.BoxRenderer {
- public void encodeBeginTobago(
+ public void encodeBegin(
FacesContext facesContext, UIComponent component) throws IOException {
HtmlRendererUtil.createHeaderAndBodyStyles(facesContext, component);
- super.encodeBeginTobago(facesContext, component);
+ super.encodeBegin(facesContext, component);
}
protected String getAttrStyleKey() {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/BoxRenderer.java Tue Nov 7 11:34:48 2006
@@ -37,10 +37,9 @@
public class BoxRenderer extends BoxRendererBase {
- public void encodeBeginTobago(
+ public void encodeBegin(
FacesContext facesContext, UIComponent component) throws IOException {
-
UIComponent label = component.getFacet(FACET_LABEL);
String labelString
= (String) component.getAttributes().get(ATTR_LABEL);
@@ -77,7 +76,7 @@
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
@@ -87,20 +86,10 @@
writer.endElement(HtmlConstants.TABLE);
}
- public void encodeChildrenTobago(FacesContext facesContext,
- UIComponent component) throws IOException {
- }
-
- public void encodeChildren(FacesContext facesContext, UIComponent component)
- throws IOException {
- }
-
public int getPaddingHeight(FacesContext facesContext, UIComponent component) {
return 10
+ (component.getFacet(FACET_LABEL) != null ? 25 : 0);
}
-
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java Tue Nov 7 11:34:48 2006
@@ -39,7 +39,7 @@
private static final Log LOG = LogFactory.getLog(ProgressRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UIOutput component = (UIOutput) uiComponent;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/MessageRenderer.java Tue Nov 7 11:34:48 2006
@@ -65,7 +65,7 @@
}
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/tag/BoxRenderer.java Tue Nov 7 11:34:48 2006
@@ -39,7 +39,7 @@
public class BoxRenderer extends org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.BoxRenderer {
- public void encodeBeginTobago(FacesContext facesContext,
+ public void encodeBegin(FacesContext facesContext,
UIComponent component) throws IOException {
HtmlRendererUtil.prepareInnerStyle(component);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/BoxRenderer.java Tue Nov 7 11:34:48 2006
@@ -48,7 +48,7 @@
public class BoxRenderer extends BoxRendererBase {
- public void encodeBeginTobago(
+ public void encodeBegin(
FacesContext facesContext, UIComponent component) throws IOException {
HtmlRendererUtil.prepareInnerStyle(component);
@@ -117,7 +117,7 @@
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ButtonRenderer.java Tue Nov 7 11:34:48 2006
@@ -47,7 +47,7 @@
private static final Log LOG = LogFactory.getLog(ButtonRenderer.class);
- public void encodeBeginTobago(FacesContext facesContext,
+ public void encodeBegin(FacesContext facesContext,
UIComponent component) throws IOException {
String clientId = component.getClientId(facesContext);
String buttonType = createButtonType(component);
@@ -117,7 +117,7 @@
}
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
writer.endElement(HtmlConstants.BUTTON);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/CalendarRenderer.java Tue Nov 7 11:34:48 2006
@@ -58,7 +58,7 @@
};
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
UIOutput output = (UIOutput) component;
UIPage page = ComponentUtil.findPage(output);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Tue Nov 7 11:34:48 2006
@@ -50,7 +50,7 @@
public class DatePickerRenderer extends LinkRenderer {
private static final Log LOG = LogFactory.getLog(DatePickerRenderer.class);
- public void encodeBeginTobago(FacesContext facesContext,
+ public void encodeBegin(FacesContext facesContext,
UIComponent component) throws IOException {
UIDatePicker link = (UIDatePicker) component;
DatePickerController datePickerController = new DatePickerController();
@@ -104,7 +104,7 @@
UIPage page = ComponentUtil.findPage(link);
page.getPopups().add(popup);
}
- super.encodeBeginTobago(facesContext, component);
+ super.encodeBegin(facesContext, component);
}
private void applyConverterPattern(UIPopup popup, String converterPattern) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DateRenderer.java Tue Nov 7 11:34:48 2006
@@ -42,7 +42,7 @@
private static final Log LOG = LogFactory.getLog(DateRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
final String[] scripts = {
"script/dateConverter.js",
@@ -61,7 +61,7 @@
String classes = ComponentUtil.getStringAttribute(component, ATTR_STYLE_CLASS);
classes = classes.replaceAll("tobago-date-", "tobago-in-");
component.getAttributes().put(ATTR_STYLE_CLASS, classes);
- super.encodeEndTobago(facesContext, component);
+ super.encodeEnd(facesContext, component);
Converter converter = getConverter(facesContext, component);
// TODO is this really needed?
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java Tue Nov 7 11:34:48 2006
@@ -103,7 +103,7 @@
}
}
- public void encodeEndTobago(
+ public void encodeEnd(
FacesContext facesContext,
UIComponent uiComponent) throws IOException {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FormRenderer.java Tue Nov 7 11:34:48 2006
@@ -28,7 +28,6 @@
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.context.FacesContext;
-import java.io.IOException;
public class FormRenderer extends RendererBase {
@@ -42,11 +41,5 @@
}
super.decode(facesContext, form);
}
-
- public void encodeEndTobago(FacesContext facesContext,
- UIComponent component) throws IOException {
-
- }
-
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Tue Nov 7 11:34:48 2006
@@ -298,7 +298,7 @@
writer.endElement(HtmlConstants.TABLE);
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
if (component.getParent() instanceof UIPage) {
LOG.error("XXXXXXXXXXXXXXXXXXXXXXX never XXXXXXXXXXXXXXXXXXXXXX", new Exception());
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/HiddenRenderer.java Tue Nov 7 11:34:48 2006
@@ -33,7 +33,7 @@
public class HiddenRenderer extends InputRendererBase {
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
final String clientId = component.getClientId(facesContext);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java Tue Nov 7 11:34:48 2006
@@ -50,7 +50,7 @@
private static final Log LOG = LogFactory.getLog(ImageRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/InRenderer.java Tue Nov 7 11:34:48 2006
@@ -57,7 +57,7 @@
private static final Log LOG = LogFactory.getLog(InRenderer.class);
@Override
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component)
throws IOException {
Iterator messages = facesContext.getMessages(
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java Tue Nov 7 11:34:48 2006
@@ -74,7 +74,7 @@
return parent;
}
- public void encodeEndTobago(
+ public void encodeEnd(
FacesContext facesContext, UIComponent component) throws IOException {
UIOutput output = (UIOutput) component;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LinkRenderer.java Tue Nov 7 11:34:48 2006
@@ -52,7 +52,7 @@
private static final Log LOG = LogFactory.getLog(LinkRenderer.class);
- public void encodeBeginTobago(FacesContext facesContext,
+ public void encodeBegin(FacesContext facesContext,
UIComponent component) throws IOException {
String onclick = null;
String href;
@@ -153,7 +153,7 @@
}
}
- public void encodeEndTobago(FacesContext facesContext, UIComponent component)
+ public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
if (ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED)) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java Tue Nov 7 11:34:48 2006
@@ -77,7 +77,7 @@
public static final String SEARCH_ID_POSTFIX = SUBCOMPONENT_SEP + "popup";
private static final String MENU_ACCELERATOR_KEYS = "menuAcceleratorKeys";
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
String clientId;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessageRenderer.java Tue Nov 7 11:34:48 2006
@@ -59,7 +59,7 @@
return count * getConfiguredValue(facesContext, component, "messageHeight");
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
@@ -92,7 +92,5 @@
writer.endElement(HtmlConstants.SPAN);
}
-// ///////////////////////////////////////////// bean getter + setter
-
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java Tue Nov 7 11:34:48 2006
@@ -44,7 +44,6 @@
private static final Log LOG = LogFactory.getLog(MessagesRenderer.class);
-
public int getFixedHeight(FacesContext facesContext, UIComponent component) {
int count = 0;
for (Iterator i = facesContext.getMessages(); i.hasNext(); i.next()) {
@@ -59,7 +58,7 @@
: getConfiguredValue(facesContext, component, "fixedHeight");
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
@@ -122,8 +121,6 @@
writer.startElement(HtmlConstants.BR, null);
writer.endElement(HtmlConstants.BR);
}
-
-// ///////////////////////////////////////////// bean getter + setter
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java Tue Nov 7 11:34:48 2006
@@ -30,7 +30,7 @@
import java.io.IOException;
public class ObjectRenderer extends RendererBase {
- public void encodeEndTobago(FacesContext facesContext, UIComponent component)
+ public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
writer.startElement(HtmlConstants.IFRAME, component);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/OutRenderer.java Tue Nov 7 11:34:48 2006
@@ -38,7 +38,7 @@
public class OutRenderer extends RendererBase {
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
String text = ComponentUtil.currentValue(component);
if (text == null) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java Tue Nov 7 11:34:48 2006
@@ -114,7 +114,7 @@
return height;
}
- public void encodeChildrenTobago(FacesContext facesContext,
+ public void encodeChildren(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UIPanel component = (UIPanel) uiComponent;
@@ -124,7 +124,7 @@
}
}
- public void encodeBeginTobago(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
String clientId = component.getClientId(facesContext);
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
writer.startElement(HtmlConstants.DIV, component);
@@ -148,7 +148,7 @@
}
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
writer.endElement(HtmlConstants.DIV);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Tue Nov 7 11:34:48 2006
@@ -69,7 +69,7 @@
}
}
- public void encodeBeginTobago(
+ public void encodeBegin(
FacesContext facesContext, UIComponent uiComponent) throws IOException {
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
@@ -123,7 +123,7 @@
writer.writeAttribute(HtmlAttributes.STYLE, contentStyle.toString(), null);
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
UIPopup component = (UIPopup) uiComponent;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java Tue Nov 7 11:34:48 2006
@@ -41,7 +41,7 @@
private static final Log LOG = LogFactory.getLog(ProgressRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UIOutput component = (UIOutput) uiComponent;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java Tue Nov 7 11:34:48 2006
@@ -94,7 +94,7 @@
return content;
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UIInput component = (UIInput) uiComponent;
@@ -217,6 +217,5 @@
return toolbar;
}
-// ///////////////////////////////////////////// bean getter + setter
}
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -58,7 +58,7 @@
}
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UISelectBoolean component = (UISelectBoolean) uiComponent;
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -44,7 +44,7 @@
private static final Log LOG = LogFactory.getLog(SelectManyCheckboxRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UISelectMany component = (UISelectMany) uiComponent;
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -74,7 +74,7 @@
return fixedHeight;
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UISelectMany component = (UISelectMany) uiComponent;
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -50,7 +50,7 @@
return true;
}
- public void encodeEndTobago(FacesContext facesContext, UIComponent uiComponent) throws IOException {
+ public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
UISelectOne component = (UISelectOne) uiComponent;
List<SelectItem> items = ComponentUtil.getSelectItems(component);
@@ -79,7 +79,7 @@
HtmlRendererUtil.renderSelectItems(component, items, values, writer, facesContext);
writer.endElement(HtmlConstants.SELECT);
- super.encodeEndTobago(facesContext, component);
+ super.encodeEnd(facesContext, component);
checkForCommandFacet(component, facesContext, writer);
}
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -71,7 +71,7 @@
return fixedHeight;
}
- public void encodeEndTobago(FacesContext facesContext, UIComponent input) throws IOException {
+ public void encodeEnd(FacesContext facesContext, UIComponent input) throws IOException {
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
UISelectOne component = (UISelectOne) input;
@@ -97,7 +97,7 @@
HtmlRendererUtil.renderSelectItems(component, items, values, writer, facesContext);
writer.endElement(HtmlConstants.SELECT);
- super.encodeEndTobago(facesContext, component);
+ super.encodeEnd(facesContext, component);
checkForCommandFacet(component, facesContext, writer);
}
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -48,7 +48,7 @@
private static final Log LOG = LogFactory.getLog(SelectOneRadioRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UISelectOne component = (UISelectOne) uiComponent;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectReferenceRenderer.java Tue Nov 7 11:34:48 2006
@@ -35,17 +35,9 @@
public class SelectReferenceRenderer extends RendererBase{
-// ///////////////////////////////////////////// constant
-
private static final Log LOG = LogFactory.getLog(SelectReferenceRenderer.class);
-// ///////////////////////////////////////////// attribute
-
-// ///////////////////////////////////////////// constructor
-
-// ///////////////////////////////////////////// code
-
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component)
throws IOException {
String referenceId = (String)
@@ -59,8 +51,6 @@
reference.getAttributes().remove(ATTR_RENDER_RANGE_EXTERN);
}
-
-// ///////////////////////////////////////////// bean getter + setter
}
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -107,8 +107,10 @@
= SUBCOMPONENT_SEP + "selected";
private static final Integer HEIGHT_0 = 0;
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
+
+ storeFooterHeight(facesContext, uiComponent);
UIData data = (UIData) uiComponent;
HtmlRendererUtil.createHeaderAndBodyStyles(facesContext, data);
@@ -537,8 +539,6 @@
}
}
-// ----------------------------------------------------------- business methods
-
private String createSheetPagingInfo(UIData data,
FacesContext facesContext, String pagerCommandId, boolean row) {
String sheetPagingInfo;
@@ -610,13 +610,6 @@
ATTR_SELECTED_LIST_STRING, selectedRows);
}
}
-
- public void encodeEnd(FacesContext facesContext, UIComponent component)
- throws IOException {
- storeFooterHeight(facesContext, component);
- super.encodeEnd(facesContext, component);
- }
-
public boolean needVerticalScrollbar(FacesContext facesContext, UIData data) {
// estimate need of height-scrollbar on client, if yes we have to consider
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SubviewRenderer.java Tue Nov 7 11:34:48 2006
@@ -39,7 +39,7 @@
super.encodeBegin(facesContext, component);
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
}
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -97,7 +97,7 @@
}
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -44,7 +44,7 @@
public class TextAreaRenderer extends InputRendererBase {
@Override
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
UIInput input = (UIInput) component;
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -53,7 +53,7 @@
private static final Log LOG = LogFactory.getLog(TimeRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
List<String> scriptFiles = ComponentUtil.findPage(component).getScriptFiles();
@@ -208,7 +208,7 @@
}
private void writeInput(TobagoResponseWriter writer, String id, String hour, boolean hourMode)
- throws IOException {
+ throws IOException {
writer.startElement(HtmlConstants.INPUT);
writer.writeAttribute(HtmlAttributes.TYPE, "text", false);
writer.writeIdAttribute(id);
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -75,7 +75,7 @@
private static final Log LOG = LogFactory.getLog(ToolBarRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
UIPanel toolbar = (UIPanel) uiComponent;
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -45,7 +45,7 @@
private static final Log LOG = LogFactory.getLog(TreeListboxBoxRenderer.class);
- public void encodeEndTobago(FacesContext facesContext, UIComponent component)
+ public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
int level = ((UITreeListboxBox) component).getLevel();
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -48,7 +48,7 @@
private static final Log LOG = LogFactory.getLog(TreeListboxRenderer.class);
@Override
- public void encodeBeginTobago(
+ public void encodeBegin(
FacesContext facesContext, UIComponent component) throws IOException {
@@ -199,7 +199,7 @@
// }
@Override
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
writer.endElement(HtmlConstants.DIV);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Tue Nov 7 11:34:48 2006
@@ -146,7 +146,7 @@
return treeNodeParameter;
}
- public void encodeBeginTobago(FacesContext facesContext,
+ public void encodeBegin(FacesContext facesContext,
UIComponent component) throws IOException {
UITreeNode treeNode = (UITreeNode) component;
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java Tue Nov 7 11:34:48 2006
@@ -105,7 +105,7 @@
}
@Override
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
UITree tree = (UITree) component;
@@ -255,10 +255,6 @@
facesContext.setResponseWriter(writer);
return stringWriter.toString();
}
-
-// ///////////////////////////////////////////// bean getter + setter
-
-
protected String nodeStateId(FacesContext facesContext, UITreeNode node) {
// this must do the same as nodeStateId() in tree.js
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/VerbatimRenderer.java Tue Nov 7 11:34:48 2006
@@ -36,7 +36,7 @@
private static final Log LOG = LogFactory.getLog(VerbatimRenderer.class);
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
LOG.info("HI! " + component.getClientId(facesContext), new Exception());
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=472219&r1=472218&r2=472219
==============================================================================
--- 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 Tue Nov 7 11:34:48 2006
@@ -56,7 +56,7 @@
return super.getFixedHeight(facesContext, component);
}
- public void encodeBeginTobago(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
HtmlRendererUtil.prepareInnerStyle(component);
@@ -127,7 +127,7 @@
writer.endElement(HtmlConstants.DIV);
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java Tue Nov 7 11:34:48 2006
@@ -34,14 +34,9 @@
return true;
}
+ public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
+ Layout.putLayout(component, Layout.getLayout(component.getParent()));
- public void encodeBegin(FacesContext facesContext,
- UIComponent uiComponent) throws IOException {
- Layout.putLayout(uiComponent, Layout.getLayout(uiComponent.getParent()));
- super.encodeBegin(facesContext, uiComponent);
- }
-
- public void encodeBeginTobago(FacesContext facesContext, UIComponent component) throws IOException {
Layout layout = Layout.getLayout(component.getParent());
int borderWidth = 5;
int height = 50;
@@ -83,7 +78,7 @@
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/FoRendererBase.java Tue Nov 7 11:34:48 2006
@@ -18,16 +18,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.ComponentUtil;
-import org.apache.myfaces.tobago.renderkit.LayoutManager;
import org.apache.myfaces.tobago.renderkit.RendererBase;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.render.Renderer;
-import java.io.IOException;
-
-/**
+/*
* Created: Dec 3, 2004 12:07:38 AM
* User: bommel
* $Id$
@@ -36,64 +29,5 @@
private static final Log LOG = LogFactory.getLog(FoRendererBase.class);
- private LayoutManager getLayoutManager(
- FacesContext facesContext,
- UIComponent component) {
- LayoutManager layoutManager = null;
-
- Renderer renderer = ComponentUtil.getRenderer(facesContext, component);
- if (renderer instanceof LayoutManager) {
- return (LayoutManager) renderer;
- }
- return layoutManager;
- }
-
- public void encodeBegin(FacesContext facesContext, UIComponent component)
- throws IOException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("*** begin " + component);
- }
- try {
-
-// createClassAttribute(component);
-
- encodeBeginTobago(facesContext, component);
-
- } catch (IOException e) {
- throw e;
- } catch (RuntimeException e) {
- LOG.error("catched RuntimeException :", e);
- throw e;
- } catch (Throwable e) {
- LOG.error("catched Throwable :", e);
- throw new RuntimeException(e);
- }
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("* begin " + component);
- }
- }
-
- public void encodeEnd(FacesContext facesContext, UIComponent component)
- throws IOException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("*** end " + component);
- }
- try {
-
- encodeEndTobago(facesContext, component);
- } catch (IOException e) {
- throw e;
- } catch (RuntimeException e) {
- LOG.error("catched " + e + " :" + e.getMessage(), e);
- throw e;
- } catch (Throwable e) {
- LOG.error("catched Throwable :", e);
- throw new RuntimeException(e);
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("* end " + component);
- }
- }
}
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/InRenderer.java Tue Nov 7 11:34:48 2006
@@ -37,28 +37,9 @@
private static final Log LOG = LogFactory.getLog(InRenderer.class);
- public void encodeEnd(FacesContext facesContext, UIComponent component)
- throws IOException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("*** end " + component);
- }
- try {
- encodeEndTobago(facesContext, component);
- } catch (IOException e) {
- throw e;
- } catch (RuntimeException e) {
- LOG.error("catched " + e + " :" + e.getMessage(), e);
- throw e;
- } catch (Throwable e) {
- LOG.error("catched Throwable :", e);
- throw new RuntimeException(e);
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("* end " + component);
- }
- }
- public void encodeEndTobago(FacesContext facesContext,
+
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
UIComponent label = component.getFacet(FACET_LABEL);
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/LabelRenderer.java Tue Nov 7 11:34:48 2006
@@ -29,7 +29,7 @@
*/
public class LabelRenderer extends FoRendererBase {
- public void encodeEndTobago(
+ public void encodeEnd(
FacesContext facesContext, UIComponent component) throws IOException {
UIOutput output = (UIOutput) component;
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessageRenderer.java Tue Nov 7 11:34:48 2006
@@ -20,38 +20,13 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.renderkit.MessageRendererBase;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
-/**
+/*
* Created: Dec 1, 2004 7:31:22 PM
* User: bommel
* $Id$
*/
public class MessageRenderer extends MessageRendererBase {
private static final Log LOG = LogFactory.getLog(MessageRenderer.class);
-
- public void encodeEnd(FacesContext facesContext, UIComponent component)
- throws IOException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("*** end " + component);
- }
- try {
- encodeEndTobago(facesContext, component);
- } catch (IOException e) {
- throw e;
- } catch (RuntimeException e) {
- LOG.error("catched " + e + " :" + e.getMessage(), e);
- throw e;
- } catch (Throwable e) {
- LOG.error("catched Throwable :", e);
- throw new RuntimeException(e);
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("* end " + component);
- }
- }
-
}
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/MessagesRenderer.java Tue Nov 7 11:34:48 2006
@@ -20,10 +20,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.renderkit.MessageRendererBase;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import java.io.IOException;
-
/**
* Created: Dec 1, 2004 7:34:05 PM
* User: bommel
@@ -31,25 +27,4 @@
*/
public class MessagesRenderer extends MessageRendererBase {
private static final Log LOG = LogFactory.getLog(MessagesRenderer.class);
-
- public void encodeEnd(FacesContext facesContext, UIComponent component)
- throws IOException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("*** end " + component);
- }
- try {
- encodeEndTobago(facesContext, component);
- } catch (IOException e) {
- throw e;
- } catch (RuntimeException e) {
- LOG.error("catched " + e + " :" + e.getMessage(), e);
- throw e;
- } catch (Throwable e) {
- LOG.error("catched Throwable :", e);
- throw new RuntimeException(e);
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("* end " + component);
- }
- }
}
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/OutRenderer.java Tue Nov 7 11:34:48 2006
@@ -24,14 +24,14 @@
import javax.faces.context.ResponseWriter;
import java.io.IOException;
-/**
+/*
* Created: Nov 29, 2004 7:02:04 PM
* User: bommel
* $Id$
*/
public class OutRenderer extends RendererBase {
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
String text = ComponentUtil.currentValue(component);
if (text == null) {
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PageRenderer.java Tue Nov 7 11:34:48 2006
@@ -53,7 +53,7 @@
return true;
}
- public void encodeBeginTobago(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
UIPage page = (UIPage) component;
Layout layout = new Layout(2100, 2970);
int margin = 60;
@@ -92,7 +92,7 @@
Layout.putLayout(page, in);
}
- public void encodeEndTobago(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java Tue Nov 7 11:34:48 2006
@@ -37,7 +37,7 @@
super.encodeBegin(facesContext, uiComponent);
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
}
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/TextAreaRenderer.java Tue Nov 7 11:34:48 2006
@@ -34,31 +34,11 @@
public class TextAreaRenderer extends InputRendererBase {
private static final Log LOG = LogFactory.getLog(TextAreaRenderer.class);
- public void encodeEnd(FacesContext facesContext, UIComponent component)
- throws IOException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("*** end " + component);
- }
- try {
- encodeEndTobago(facesContext, component);
- } catch (IOException e) {
- throw e;
- } catch (RuntimeException e) {
- LOG.error("catched " + e + " :" + e.getMessage(), e);
- throw e;
- } catch (Throwable e) {
- LOG.error("catched Throwable :", e);
- throw new RuntimeException(e);
- }
- if (LOG.isDebugEnabled()) {
- LOG.debug("* end " + component);
- }
- }
public boolean getRendersChildren() {
return false;
}
- public void encodeEndTobago(FacesContext facesContext,
+ public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
String text = ComponentUtil.currentValue(component);
if (text == null) {
@@ -80,8 +60,6 @@
layout.addMargin(200, 0, 0, 0);
}
-
}
-
}
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java Tue Nov 7 11:34:48 2006
@@ -30,12 +30,12 @@
public class BoxRenderer extends BoxRendererBase {
- public void encodeBeginTobago(FacesContext facesContext, UIComponent component)
+ public void encodeBegin(FacesContext facesContext, UIComponent component)
throws IOException {
// <card> ?
}
- public void encodeEndTobago(FacesContext facesContext, UIComponent component)
+ public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
//UIPanel panel = (UIPanel) component;
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java?view=diff&rev=472219&r1=472218&r2=472219
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/ButtonRenderer.java Tue Nov 7 11:34:48 2006
@@ -43,7 +43,7 @@
private static final Log LOG = LogFactory.getLog(ButtonRenderer.class);
- public void encodeEndTobago(FacesContext facesContext, UIComponent component)
+ public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
UICommand command = (UICommand) component;