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/09/23 12:44:29 UTC
svn commit: r449215 [1/3] - in /myfaces/tobago/trunk/theme:
scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/
scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/tag/
scarbor...
Author: bommel
Date: Sat Sep 23 03:44:27 2006
New Revision: 449215
URL: http://svn.apache.org/viewvc?view=rev&rev=449215
Log:
moved html tags and attributes to Interfaces
Modified:
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/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/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/LabeledInputLayoutRenderer.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/PageRenderer.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/SheetRenderer.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/TreeRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -26,6 +26,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.FACET_LABEL;
import org.apache.myfaces.tobago.renderkit.BoxRendererBase;
import org.apache.myfaces.tobago.renderkit.RenderUtil;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -48,30 +50,30 @@
// TODO: move fix style attributes to style.css (border, padding, align, etc)
- writer.startElement("table", component);
- writer.writeAttribute("style", null, ATTR_STYLE);
- writer.writeAttribute("border", "1", null);
- writer.writeAttribute("cellpadding", "5", null);
- writer.writeAttribute("cellspacing", "0", null);
- writer.writeAttribute("summary", "", null);
+ writer.startElement(HtmlConstants.TABLE, component);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.BORDER, "1", null);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, "5", null);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
if (label != null || labelString != null) {
- writer.startElement("tr", null);
- writer.startElement("th", null);
- writer.writeAttribute("align", "left", null);
+ writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlConstants.TH, null);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "left", null);
writer.writeText("", null);
if (label != null) {
RenderUtil.encode(facesContext, label);
} else {
writer.writeText(labelString, null);
}
- writer.endElement("th");
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TH);
+ writer.endElement(HtmlConstants.TR);
}
- writer.startElement("tr", null);
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlConstants.TD, null);
}
@@ -80,9 +82,9 @@
ResponseWriter writer = facesContext.getResponseWriter();
- writer.endElement("td");
- writer.endElement("tr");
- writer.endElement("table");
+ writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlConstants.TABLE);
}
public void encodeChildrenTobago(FacesContext facesContext,
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -24,6 +24,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
@@ -51,32 +53,30 @@
ResponseWriter writer = facesContext.getResponseWriter();
- writer.startElement("table", null);
- writer.writeAttribute("border", "0", null);
- writer.writeAttribute("cellspacing", "0", null);
- writer.writeAttribute("cellpadding", "0", null);
- writer.writeAttribute("summary", "", null);
-
- writer.startElement("tr", null);
-
- writer.startElement("td", null);
- writer.writeAttribute("style", "background-color: #aabbcc;", null);
- writer.writeAttribute("width", Integer.toString(model.getValue()), null);
+ writer.startElement(HtmlConstants.TABLE, null);
+ writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
+
+ writer.startElement(HtmlConstants.TR, null);
+
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "background-color: #aabbcc;", null);
+ writer.writeAttribute(HtmlAttributes.WIDTH, Integer.toString(model.getValue()), null);
writer.write(" ");
- writer.endElement("td");
+ writer.endElement(HtmlConstants.TD);
- writer.startElement("td", null);
- writer.writeAttribute("style", "background-color: #ddeeff;", null);
- writer.writeAttribute("width",
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "background-color: #ddeeff;", null);
+ writer.writeAttribute(HtmlAttributes.WIDTH,
Integer.toString(model.getMaximum() - model.getValue()), null);
writer.write(" ");
- writer.endElement("td");
+ writer.endElement(HtmlConstants.TD);
- writer.endElement("tr");
- writer.endElement("table");
+ writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlConstants.TABLE);
}
-
-// ///////////////////////////////////////////// bean getter + setter
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -28,6 +28,7 @@
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.renderkit.MessageRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.application.FacesMessage;
@@ -79,32 +80,32 @@
if (iterator.hasNext()) {
- writer.startElement("span", component);
+ writer.startElement(HtmlConstants.SPAN, component);
writer.writeClassAttribute("tobago-validation-message");
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
while (iterator.hasNext()) {
FacesMessage message = (FacesMessage) iterator.next();
// MessageFormat detail = new MessageFormat(formatString, tobagoContext.getLocale());
writer.startElement(HtmlConstants.LABEL, null);
- writer.writeAttribute("for", clientId, null);
- writer.writeAttribute("title", message.getDetail(), null);
+ writer.writeAttribute(HtmlAttributes.FOR, clientId, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, message.getDetail(), null);
writer.writeText(message.getSummary(), null);
writer.endElement(HtmlConstants.LABEL);
- writer.startElement("br", null);
- writer.endElement("br");
+ writer.startElement(HtmlConstants.BR, null);
+ writer.endElement(HtmlConstants.BR);
}
- writer.endElement("span");
+ writer.endElement(HtmlConstants.SPAN);
} else {
- writer.startElement("img", null);
+ writer.startElement(HtmlConstants.IMG, null);
String image = ResourceManagerUtil.getImageWithPath(
facesContext, "image/1x1.gif");
- writer.writeAttribute("src", image, null);
- writer.writeAttribute("alt", "", null);
- writer.writeAttribute("style", "border: 0px; height: 1px; width: 1px;", null);
- writer.endElement("img");
+ writer.writeAttribute(HtmlAttributes.SRC, image, null);
+ writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "border: 0px; height: 1px; width: 1px;", null);
+ writer.endElement(HtmlConstants.IMG);
}
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -29,6 +29,8 @@
import org.apache.myfaces.tobago.context.UserAgent;
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.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -48,32 +50,32 @@
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("fieldset", component);
+ writer.startElement(HtmlConstants.FIELDSET, component);
writer.writeComponentClass();
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
if (label != null || labelString != null) {
- writer.startElement("legend", component);
+ writer.startElement(HtmlConstants.LEGEND, component);
writer.writeComponentClass();
- writer.startElement("b", null);
+ writer.startElement(HtmlConstants.B, null);
writer.writeText("", null);
if (label != null) {
RenderUtil.encode(facesContext, label);
} else {
writer.writeText(labelString, null);
}
- writer.endElement("b");
- writer.endElement("legend");
+ writer.endElement(HtmlConstants.B);
+ writer.endElement(HtmlConstants.LEGEND);
if (!ClientProperties.getInstance(facesContext.getViewRoot())
.getUserAgent().equals(UserAgent.OPERA_7_11)) {
- writer.startElement("br", null);
- writer.endElement("br");
+ writer.startElement(HtmlConstants.BR, null);
+ writer.endElement(HtmlConstants.BR);
}
}
- writer.startElement("div", component);
+ writer.startElement(HtmlConstants.DIV, component);
writer.writeComponentClass();
- writer.writeAttribute("style", null, ATTR_STYLE_INNER);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE_INNER);
}
public int getPaddingWidth(FacesContext facesContext, UIComponent 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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -34,6 +34,8 @@
import org.apache.myfaces.tobago.renderkit.BoxRendererBase;
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.taglib.component.ToolBarTag;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -66,12 +68,12 @@
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("fieldset", component);
+ writer.startElement(HtmlConstants.FIELDSET, component);
writer.writeComponentClass();
- writer.writeAttribute("style", style, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, style, null);
if (label != null || labelString != null) {
- writer.startElement("legend", component);
+ writer.startElement(HtmlConstants.LEGEND, component);
writer.writeComponentClass();
writer.writeText("", null);
@@ -80,15 +82,15 @@
} else {
writer.writeText(labelString, null);
}
- writer.endElement("legend");
+ writer.endElement(HtmlConstants.LEGEND);
}
String contentStyle = (String)
component.getAttributes().get(ATTR_STYLE_INNER);
if (toolbar != null) {
- writer.startElement("div", null);
+ writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-box-toolbar-div");
- writer.startElement("div", null);
+ writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-box-toolbar-span");
final Map attributes = toolbar.getAttributes();
attributes.put(
@@ -100,16 +102,16 @@
attributes.put(ATTR_ICON_SIZE, ToolBarTag.ICON_SMALL);
}
RenderUtil.encode(facesContext, toolbar);
- writer.endElement("div");
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlConstants.DIV);
if (ClientProperties.getInstance(facesContext.getViewRoot()).getUserAgent().isMsie()) {
contentStyle
= HtmlRendererUtil.replaceStyleAttribute(contentStyle, "top", "-10px");
}
}
- writer.startElement("div", component);
+ writer.startElement(HtmlConstants.DIV, component);
writer.writeComponentClass();
- writer.writeAttribute("style", contentStyle, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, contentStyle, null);
}
@@ -117,8 +119,8 @@
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
- writer.endElement("div");
- writer.endElement("fieldset");
+ writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlConstants.FIELDSET);
}
public boolean getRendersChildren() {
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -36,6 +36,8 @@
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
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.util.AccessKeyMap;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -69,16 +71,16 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
- writer.startElement("button", component);
- writer.writeAttribute("type", buttonType, null);
+ writer.startElement(HtmlConstants.BUTTON, component);
+ writer.writeAttribute(HtmlAttributes.TYPE, buttonType, null);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
- writer.writeAttribute("title", null, ATTR_TIP);
- writer.writeAttribute("disabled", disabled);
+ writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
if (onclick != null) {
- writer.writeAttribute("onclick", onclick, null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, null);
}
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
writer.writeComponentClass();
writer.writeText("", null); // force closing the start tag
@@ -92,10 +94,10 @@
if (image == null) {
image = ResourceManagerUtil.getImageWithPath(facesContext, imageName);
}
- writer.startElement("img", null);
- writer.writeAttribute("src", image, null);
- writer.writeAttribute("alt", "", null);
- writer.endElement("img");
+ writer.startElement(HtmlConstants.IMG, null);
+ writer.writeAttribute(HtmlAttributes.SRC, image, null);
+ writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.endElement(HtmlConstants.IMG);
}
// label
@@ -121,7 +123,7 @@
public void encodeEndTobago(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
- writer.endElement("button");
+ writer.endElement(HtmlConstants.BUTTON);
}
private String createButtonType(UIComponent component) {
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -32,6 +32,8 @@
import org.apache.myfaces.tobago.model.DateModel;
import org.apache.myfaces.tobago.renderkit.RendererBase;
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.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -91,79 +93,79 @@
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("table", component);
+ writer.startElement(HtmlConstants.TABLE, component);
writer.writeIdAttribute(id);
writer.writeComponentClass();
- writer.writeAttribute("cellspacing", "0", null);
- writer.writeAttribute("cellpadding", "3", null);
- writer.writeAttribute("summary", "", null);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, "3", null);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
- writer.startElement("tr", null);
+ writer.startElement(HtmlConstants.TR, null);
writer.writeClassAttribute("tobago-calendar-header-tr");
- writer.startElement("th", null);
- writer.writeAttribute("colspan", "7", null);
+ writer.startElement(HtmlConstants.TH, null);
+ writer.writeAttribute(HtmlAttributes.COLSPAN, "7", null);
- writer.startElement("table", null);
- writer.writeAttribute("summary", "", null);
+ writer.startElement(HtmlConstants.TABLE, null);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
writer.writeClassAttribute("tobago-calendar-header");
- writer.startElement("tr", null);
+ writer.startElement(HtmlConstants.TR, null);
- writer.startElement("td", null);
- writer.writeAttribute("align", "left", null);
- writer.startElement("img", null);
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "left", null);
+ writer.startElement(HtmlConstants.IMG, null);
writer.writeClassAttribute("tobago-calendar-header");
- writer.writeAttribute("alt", "", null);
- writer.writeAttribute("src",
+ writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.SRC,
ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarFastPrev.gif"), null);
- writer.writeAttribute("onclick", "addMonth('" + id + "', -12)", null);
- writer.endElement("img");
- writer.endElement("td");
-
- writer.startElement("td", null);
- writer.writeAttribute("align", "left", null);
- writer.startElement("img", null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', -12)", null);
+ writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlConstants.TD);
+
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "left", null);
+ writer.startElement(HtmlConstants.IMG, null);
writer.writeClassAttribute("tobago-calendar-header");
- writer.writeAttribute("alt", "", null);
- writer.writeAttribute("src", ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarPrev.gif"), null);
- writer.writeAttribute("onclick", "addMonth('" + id + "', -1)", null);
- writer.endElement("img");
- writer.endElement("td");
+ writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.SRC, ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarPrev.gif"), null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', -1)", null);
+ writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlConstants.TD);
- writer.startElement("th", null);
+ writer.startElement(HtmlConstants.TH, null);
writer.writeClassAttribute("tobago-calendar-header-center");
- writer.writeAttribute("align", "center", null);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "center", null);
writer.writeIdAttribute(id + ":title");
writer.writeText(dateFormat.format(calendar.getTime()), null);
- writer.endElement("th");
+ writer.endElement(HtmlConstants.TH);
- writer.startElement("td", null);
- writer.writeAttribute("align", "right", null);
- writer.startElement("img", null);
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "right", null);
+ writer.startElement(HtmlConstants.IMG, null);
writer.writeClassAttribute("tobago-calendar-header");
- writer.writeAttribute("alt", "", null);
- writer.writeAttribute("src", ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarNext.gif"), null);
- writer.writeAttribute("onclick", "addMonth('" + id + "', 1)", null);
- writer.endElement("img");
- writer.endElement("td");
-
- writer.startElement("td", null);
- writer.writeAttribute("align", "right", null);
- writer.startElement("img", null);
+ writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.SRC, ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarNext.gif"), null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', 1)", null);
+ writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlConstants.TD);
+
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.ALIGN, "right", null);
+ writer.startElement(HtmlConstants.IMG, null);
writer.writeClassAttribute("tobago-calendar-header");
- writer.writeAttribute("alt", "", null);
- writer.writeAttribute("src",
+ writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.SRC,
ResourceManagerUtil.getImageWithPath(facesContext, "image/calendarFastNext.gif"), null);
- writer.writeAttribute("onclick", "addMonth('" + id + "', 12)", null);
- writer.endElement("img");
- writer.endElement("td");
+ writer.writeAttribute(HtmlAttributes.ONCLICK, "addMonth('" + id + "', 12)", null);
+ writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlConstants.TD);
- writer.endElement("tr");
- writer.endElement("table");
+ writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlConstants.TABLE);
- writer.endElement("th");
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TH);
+ writer.endElement(HtmlConstants.TR);
- writer.startElement("tr", null);
+ writer.startElement(HtmlConstants.TR, null);
dateFormat = new SimpleDateFormat("E", locale);
for (int dayIt = 0; dayIt < 7; ++dayIt) {
@@ -171,20 +173,20 @@
String dayName = dateFormat.format(date.getCalendar().getTime());
dayName = StringUtils.substring(dayName, 0, 2);
- writer.startElement("th", null);
+ writer.startElement(HtmlConstants.TH, null);
writer.writeClassAttribute("tobago-calendar-inner-header");
writer.writeText(dayName, null);
- writer.endElement("th");
+ writer.endElement(HtmlConstants.TH);
}
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TR);
// int weekCount = model.getWeekCount();
for (int week = 0; week < 6; ++week) {
// String style = (week < weekCount) ? "" : "style=\"display: none\"";
- writer.startElement("tr", null);
+ writer.startElement(HtmlConstants.TR, null);
writer.writeIdAttribute(id + ":" + week);
-// writer.writeAttribute("style", style, null);
+// writer.writeAttribute(HtmlAttributes.STYLE, style, null);
for (int dayIt = 0; dayIt < 7; ++dayIt) {
// if (week < weekCount) {
@@ -192,22 +194,22 @@
String dayDescription = String.valueOf(date.getDay());
String onclick = "selectDay('" + id + "', " + week + " , " + dayIt + ");";
- writer.startElement("td", null);
- writer.writeAttribute("onclick", onclick, null);
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, null);
writer.writeIdAttribute(id + ":" + week + ":" + dayIt);
writer.writeClassAttribute(getClass(date, model));
writer.writeText(dayDescription, null);
- writer.endElement("td");
+ writer.endElement(HtmlConstants.TD);
// } else {
// % ><td id="< %= id + ":" + week + ":" + day % >">x</td>< %
// }
}
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TR);
}
- writer.endElement("table");
+ writer.endElement(HtmlConstants.TABLE);
writeInputHidden(writer, "/" + id + "/year", id + ":year", Integer.toString(calendar.get(Calendar.YEAR)));
@@ -237,14 +239,14 @@
private void writeInputHidden(TobagoResponseWriter writer, String name,
String id, Object value) throws IOException {
- writer.startElement("input", null);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
if (name != null) {
writer.writeNameAttribute(name);
}
writer.writeIdAttribute(id);
- writer.writeAttribute("value", value, null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, value, null);
+ writer.endElement(HtmlConstants.INPUT);
}
private static String getClass(DateModel date, CalendarModel model) {
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -27,6 +27,8 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.config.TobagoConfig;
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.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -70,11 +72,11 @@
TobagoResponseWriter writer = (TobagoResponseWriter)
facesContext.getResponseWriter();
String id = component.getClientId(facesContext);
- writer.startElement("input", component);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, component);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeIdAttribute(id + ":converterPattern");
- writer.writeAttribute("value", pattern, null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, pattern, null);
+ writer.endElement(HtmlConstants.INPUT);
}
}
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -31,6 +31,8 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.util.LayoutUtil;
import org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataRequest;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -111,18 +113,18 @@
TobagoResponseWriter writer
= (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("input", component);
- writer.writeAttribute("type", "file", null);
+ writer.startElement(HtmlConstants.INPUT, component);
+ writer.writeAttribute(HtmlAttributes.TYPE, "file", null);
writer.writeComponentClass();
if (!ClientProperties.getInstance(facesContext).getUserAgent().isMozilla()) {
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
}
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
- writer.writeAttribute("readonly",
+ writer.writeAttribute(HtmlAttributes.READONLY,
ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED));
- writer.writeAttribute("title", null, ATTR_TIP);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.endElement(HtmlConstants.INPUT);
}
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -50,6 +50,8 @@
import org.apache.myfaces.tobago.renderkit.RenderUtil;
import org.apache.myfaces.tobago.renderkit.RendererBase;
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.util.LayoutInfo;
import org.apache.myfaces.tobago.util.LayoutUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -166,27 +168,27 @@
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("table", layout);
- writer.writeAttribute("border", null, ATTR_BORDER);
+ writer.startElement(HtmlConstants.TABLE, layout);
+ writer.writeAttribute(HtmlAttributes.BORDER, null, ATTR_BORDER);
writer.writeComponentClass();
- writer.writeAttribute("style", null, ATTR_LAYOUT_TABLE_STYLE);
- writer.writeAttribute("cellspacing", "0", null);
- writer.writeAttribute("cellpadding", "0", null);
- writer.writeAttribute("summary", "", null);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_LAYOUT_TABLE_STYLE);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
if (columnWidths != null) {
- writer.startElement("colgroup", null);
+ writer.startElement(HtmlConstants.COLGROUP, null);
for (int i = 0; i < columnWidths.size(); i++) {
int cellWidth
= ((Integer) columnWidths.get(i)).intValue();
if (cellWidth != LayoutInfo.HIDE) {
cellWidth += getCellPadding(facesContext, layout, i);
- writer.startElement("col", null);
- writer.writeAttribute("width", Integer.toString(cellWidth), null);
- writer.endElement("col");
+ writer.startElement(HtmlConstants.COL, null);
+ writer.writeAttribute(HtmlAttributes.WIDTH, Integer.toString(cellWidth), null);
+ writer.endElement(HtmlConstants.COL);
}
}
- writer.endElement("colgroup");
+ writer.endElement(HtmlConstants.COLGROUP);
}
@@ -194,7 +196,7 @@
for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
UIGridLayout.Row row = rows.get(rowIndex);
if (!row.isHidden()) {
- writer.startElement("tr", null);
+ writer.startElement(HtmlConstants.TR, null);
List cells = row.getElements();
for (int columnIndex = 0; columnIndex < cells.size(); columnIndex++) {
@@ -263,14 +265,14 @@
cellStyle += getOverflow(cell);
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.TD, null);
writer.writeClassAttribute("tobago-gridLayout-cell-td");
- writer.writeAttribute("style", cellStyle, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, cellStyle, null);
if (spanX > 1) {
- writer.writeAttribute("colspan", Integer.toString(spanX), null);
+ writer.writeAttribute(HtmlAttributes.COLSPAN, Integer.toString(spanX), null);
}
if (spanY > 1) {
- writer.writeAttribute("rowspan", Integer.toString(spanY), null);
+ writer.writeAttribute(HtmlAttributes.ROWSPAN, Integer.toString(spanY), null);
}
writer.writeText("", null);
@@ -279,21 +281,21 @@
cellStyle += " padding: " + getCellSpacing(facesContext, layout) + "px;";
}
- writer.startElement("div", null);
+ writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute(cellClasses);
- writer.writeAttribute("style", cellStyle, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, cellStyle, null);
RenderUtil.encode(facesContext, cell);
- writer.endElement("div");
- writer.endElement("td");
+ writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlConstants.TD);
}
}
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TR);
}
}
- writer.endElement("table");
+ writer.endElement(HtmlConstants.TABLE);
}
public void encodeEndTobago(FacesContext facesContext,
@@ -778,9 +780,6 @@
}
return intValue;
}
-
-// ///////////////////////////////////////////// bean getter + setter
-
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -23,6 +23,8 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -39,12 +41,12 @@
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("input", component);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, component);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
- writer.writeAttribute("value", value != null ? value : "", null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, value != null ? value : "", null);
+ writer.endElement(HtmlConstants.INPUT);
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -33,6 +33,8 @@
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.renderkit.RendererBase;
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.webapp.TobagoResponseWriter;
import javax.faces.component.UICommand;
@@ -86,27 +88,27 @@
- writer.startElement("img", graphic);
+ writer.startElement(HtmlConstants.IMG, graphic);
final String clientId = graphic.getClientId(facesContext);
writer.writeIdAttribute(clientId);
if (ComponentUtil.isHoverEnabled(graphic) && !isDisabled(graphic)) {
- writer.writeAttribute("onmouseover",
+ writer.writeAttribute(HtmlAttributes.ONMOUSEOVER,
"Tobago.imageMouseover('" + clientId + "')", null);
- writer.writeAttribute("onmouseout",
+ writer.writeAttribute(HtmlAttributes.ONMOUSEOUT,
"Tobago.imageMouseout('" + clientId + "')", null);
}
if (src != null) {
- writer.writeAttribute("src", src, null);
+ writer.writeAttribute(HtmlAttributes.SRC, src, null);
}
- writer.writeAttribute("alt", alt, null);
+ writer.writeAttribute(HtmlAttributes.ALT, alt, null);
if (tip != null) {
- writer.writeAttribute("title", tip, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, tip, null);
}
- writer.writeAttribute("border", border, null);
- writer.writeAttribute("height", null, ATTR_HEIGHT);
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.BORDER, border, null);
+ writer.writeAttribute(HtmlAttributes.HEIGHT, null, ATTR_HEIGHT);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
writer.writeComponentClass();
- writer.endElement("img");
+ writer.endElement(HtmlConstants.IMG);
}
public static String createSrc(String src, String ext) {
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -37,6 +37,8 @@
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.renderkit.html.InRendererBase;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.application.FacesMessage;
@@ -88,33 +90,33 @@
String id = component.getClientId(facesContext);
TobagoResponseWriter writer = (TobagoResponseWriter)
facesContext.getResponseWriter();
- writer.startElement("input", component);
- writer.writeAttribute("type", type, null);
+ writer.startElement(HtmlConstants.INPUT, component);
+ writer.writeAttribute(HtmlAttributes.TYPE, type, null);
writer.writeNameAttribute(id);
writer.writeIdAttribute(id);
if (currentValue != null) {
- writer.writeAttribute("value", currentValue, null);
+ writer.writeAttribute(HtmlAttributes.VALUE, currentValue, null);
}
if (title != null) {
- writer.writeAttribute("title", title, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, title, null);
}
- writer.writeAttribute("readonly",
+ writer.writeAttribute(HtmlAttributes.READONLY,
ComponentUtil.getBooleanAttribute(component, ATTR_READONLY));
- writer.writeAttribute("disabled",
+ writer.writeAttribute(HtmlAttributes.DISABLED,
ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED));
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
writer.writeComponentClass();
if (renderAjaxSuggest) {
- writer.writeAttribute("autocomplete", "off", false);
+ writer.writeAttribute(HtmlAttributes.AUTOCOMPLETE, "off", false);
}
if (component instanceof UIInput) {
String onchange = HtmlUtils.generateOnchange((UIInput) component, facesContext);
if (onchange != null) {
// TODO: create and use utility method to write attributes without quoting
- // writer.writeAttribute("onchange", onchange, null);
+ // writer.writeAttribute(HtmlAttributes.ONCHANGE, onchange, null);
}
}
- writer.endElement("input");
+ writer.endElement(HtmlConstants.INPUT);
// input suggest
if (renderAjaxSuggest) {
@@ -127,11 +129,11 @@
page.getScriptFiles().add("script/controls.js");
page.getScriptFiles().add("script/inputSuggest.js");
- writer.startElement("div");
+ writer.startElement(HtmlConstants.DIV);
writer.writeClassAttribute("tobago-in-suggest-popup");
- writer.writeAttribute("style", "display: none;", null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "display: none;", null);
writer.writeIdAttribute(popupId);
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
final String[] scripts = new String[]{
"script/effects.js",
@@ -181,17 +183,17 @@
List suggesteds = (List) mb.invoke(context, new Object[]{
AjaxPhaseListener.getValueForComponent(context, uiComponent)});
- writer.startElement("ul", null);
+ writer.startElement(HtmlConstants.UL, null);
int suggestedCount = 0;
for (Iterator i = suggesteds.iterator(); i.hasNext(); suggestedCount++) {
if (suggestedCount > maxSuggestedCount) {
break;
}
- writer.startElement("li", null);
+ writer.startElement(HtmlConstants.LI, null);
writer.writeText(i.next(), null);
- writer.endElement("li");
+ writer.endElement(HtmlConstants.LI);
}
- writer.endElement("ul");
+ writer.endElement(HtmlConstants.UL);
context.responseComplete();
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -33,6 +33,7 @@
import org.apache.myfaces.tobago.renderkit.RendererBase;
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.util.AccessKeyMap;
import org.apache.myfaces.tobago.util.LayoutUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -93,28 +94,28 @@
createClassAttribute(component);
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("div", output);
+ writer.startElement(HtmlConstants.DIV, output);
writer.writeComponentClass();
- writer.writeAttribute("style", null, ATTR_STYLE);
- writer.startElement("a", output);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+ writer.startElement(HtmlConstants.A, output);
writer.writeComponentClass();
writer.startElement(HtmlConstants.LABEL, output);
String clientId = output.getClientId(facesContext);
writer.writeIdAttribute(clientId);
if (forValue != null) {
- writer.writeAttribute("for", forValue, null);
+ writer.writeAttribute(HtmlAttributes.FOR, forValue, null);
}
writer.writeComponentClass();
if (width != null) {
- writer.writeAttribute("style", "width: " + width + "px;", null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "width: " + width + "px;", null);
}
- writer.writeAttribute("title", null, ATTR_TIP);
+ writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
if (label.getText() != null) {
HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
}
writer.endElement(HtmlConstants.LABEL);
- writer.endElement("a");
+ writer.endElement(HtmlConstants.A);
if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
@@ -124,7 +125,7 @@
HtmlRendererUtil.addClickAcceleratorKey(
facesContext, clientId, label.getAccessKey());
}
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabeledInputLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabeledInputLayoutRenderer.java?view=diff&rev=449215&r1=449214&r2=449215
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabeledInputLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabeledInputLayoutRenderer.java Sat Sep 23 03:44:27 2006
@@ -29,6 +29,8 @@
import org.apache.myfaces.tobago.renderkit.RenderUtil;
import org.apache.myfaces.tobago.renderkit.RendererBase;
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.webapp.TobagoResponseWriter;
import javax.faces.application.ViewHandler;
@@ -71,37 +73,37 @@
facesContext.getResponseWriter();
if (label != null || picker != null) {
- writer.startElement("table", component);
- writer.writeAttribute("border", "0", null);
- writer.writeAttribute("cellspacing", "0", null);
- writer.writeAttribute("cellpadding", "0", null);
- writer.writeAttribute("summary", "", null);
- writer.writeAttribute("title", null, ATTR_TIP);
- writer.startElement("tr", null);
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.TABLE, component);
+ writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
+ writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
+ writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlConstants.TD, null);
writer.writeText("", null);
}
if (label != null) {
RenderUtil.encode(facesContext, label);
- writer.endElement("td");
- writer.startElement("td", null);
+ writer.endElement(HtmlConstants.TD);
+ writer.startElement(HtmlConstants.TD, null);
}
renderComponent(facesContext, component);
if (picker != null) {
- writer.endElement("td");
- writer.startElement("td", null);
- writer.writeAttribute("style", "padding-left: 5px;", null);
+ writer.endElement(HtmlConstants.TD);
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "padding-left: 5px;", null);
renderPicker(facesContext, component, picker);
}
if (label != null || picker != null) {
- writer.endElement("td");
- writer.endElement("tr");
- writer.endElement("table");
+ writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlConstants.TABLE);
}
HtmlRendererUtil.renderFocusId(facesContext, 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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -36,6 +36,8 @@
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
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.util.AccessKeyMap;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -104,19 +106,19 @@
LabelWithAccessKey label = new LabelWithAccessKey(component);
if (ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED)) {
- writer.startElement("span", component);
+ writer.startElement(HtmlConstants.SPAN, component);
} else {
- writer.startElement("a", component);
- writer.writeAttribute("href", href, null);
+ writer.startElement(HtmlConstants.A, component);
+ writer.writeAttribute(HtmlAttributes.HREF, href, null);
if (onclick != null) {
- writer.writeAttribute("onclick", onclick, null);
+ writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, null);
}
- writer.writeAttribute("target", null, ATTR_TARGET);
+ writer.writeAttribute(HtmlAttributes.TARGET, null, ATTR_TARGET);
}
writer.writeComponentClass();
writer.writeIdAttribute(clientId);
writer.writeNameAttribute(clientId);
- writer.writeAttribute("title", null, ATTR_TIP);
+ writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
//TODO: check if this is still needed
writer.writeText("", null); // force closing the start tag
@@ -125,11 +127,11 @@
String image = (String) component.getAttributes().get(ATTR_IMAGE);
if (image != null) {
image = ResourceManagerUtil.getImageWithPath(facesContext, image);
- writer.startElement("img", null);
- writer.writeAttribute("src", image, null);
- writer.writeAttribute("alt", "", null);
- writer.writeAttribute("border", "0", null); // TODO: is border=0 setting via style possible?
- writer.endElement("img");
+ writer.startElement(HtmlConstants.IMG, null);
+ writer.writeAttribute(HtmlAttributes.SRC, image, null);
+ writer.writeAttribute(HtmlAttributes.ALT, "", null);
+ writer.writeAttribute(HtmlAttributes.BORDER, "0", null); // TODO: is border=0 setting via style possible?
+ writer.endElement(HtmlConstants.IMG);
}
// label
@@ -155,9 +157,9 @@
throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
if (ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED)) {
- writer.endElement("span");
+ writer.endElement(HtmlConstants.SPAN);
} else {
- writer.endElement("a");
+ writer.endElement(HtmlConstants.A);
}
}
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -50,6 +50,8 @@
import org.apache.myfaces.tobago.renderkit.RenderUtil;
import org.apache.myfaces.tobago.renderkit.RendererBase;
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.util.AccessKeyMap;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -87,28 +89,28 @@
TobagoResponseWriter writer
= (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("div", component);
+ writer.startElement(HtmlConstants.DIV, component);
writer.writeIdAttribute(clientId);
String cssClasses = (String) attributes.get(
ATTR_STYLE_CLASS);
if (ComponentUtil.getBooleanAttribute(component, ATTR_PAGE_MENU)) {
cssClasses += "tobago-menuBar-page-facet";
} else {
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
}
writer.writeClassAttribute(cssClasses);
/*
- writer.startElement("span");
- writer.writeAttribute("style", "position: relative", null);
+ writer.startElement(HtmlConstants.SPAN);
+ writer.writeAttribute(HtmlAttributes.STYLE, "position: relative", null);
// writer.writeClassAttribute("tobago-menuBar-container");
renderTopLevelItems(facesContext, writer, component);
- writer.endElement("span");
+ writer.endElement(HtmlConstants.SPAN);
*/
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
}
attributes.put(MENU_ACCELERATOR_KEYS, new ArrayList<String>());
StringBuffer scriptBuffer = new StringBuffer();
@@ -129,10 +131,10 @@
String bac = "green;";
for (Object o : component.getChildren()) {
if (o instanceof UIMenu) {
- writer.startElement("span");
- writer.writeAttribute("style", "position: relative; background: " + bac + ";", null);
+ writer.startElement(HtmlConstants.SPAN);
+ writer.writeAttribute(HtmlAttributes.STYLE, "position: relative; background: " + bac + ";", null);
writeMenuEntry(facesContext, writer, (UIMenu) o);
- writer.endElement("span");
+ writer.endElement(HtmlConstants.SPAN);
bac = "lime";
}
}
@@ -263,13 +265,13 @@
addImage(writer, facesContext, image, disabled);
- writer.startElement("a", null);
+ writer.startElement(HtmlConstants.A, null);
writer.writeClassAttribute(spanClass);
- writer.writeAttribute("href", "#", null);
- writer.writeAttribute("onfocus", "tobagoMenuFocus(event)", null);
- writer.writeAttribute("onblur", "tobagoMenuBlur(event)", null);
- writer.writeAttribute("onkeydown", "tobagoMenuKeyDown(event)", null);
- writer.writeAttribute("onkeypress", "tobagoMenuKeyPress(event)", null);
+ writer.writeAttribute(HtmlAttributes.HREF, "#", null);
+ writer.writeAttribute(HtmlAttributes.ONFOCUS, "tobagoMenuFocus(event)", null);
+ writer.writeAttribute(HtmlAttributes.ONBLUR, "tobagoMenuBlur(event)", null);
+ writer.writeAttribute(HtmlAttributes.ONKEYDOWN, "tobagoMenuKeyDown(event)", null);
+ writer.writeAttribute(HtmlAttributes.ONKEYPRESS, "tobagoMenuKeyPress(event)", null);
if (label.getText() != null) {
if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
@@ -283,7 +285,7 @@
}
HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
}
- writer.endElement("a");
+ writer.endElement(HtmlConstants.A);
}
private void addAcceleratorKey(
@@ -318,10 +320,10 @@
} else {
image = ResourceManagerUtil.getImageWithPath(facesContext, "image/blank.gif");
}
- writer.startElement("img", null);
+ writer.startElement(HtmlConstants.IMG, null);
writer.writeClassAttribute("tobago-menu-item-image");
- writer.writeAttribute("src", image, null);
- writer.endElement("img");
+ writer.writeAttribute(HtmlAttributes.SRC, image, null);
+ writer.endElement(HtmlConstants.IMG);
}
private void addMenuEntrys(StringBuffer sb, String var,
@@ -493,7 +495,7 @@
addImage(writer, facesContext, image, disabled);
- writer.startElement("a", null);
+ writer.startElement(HtmlConstants.A, null);
writer.writeClassAttribute(spanClass);
if (label.getAccessKey() != null) {
if (LOG.isInfoEnabled()
@@ -506,15 +508,15 @@
addAcceleratorKey(facesContext, command, label.getAccessKey());
}
}
- writer.writeAttribute("href", "#", null);
- writer.writeAttribute("onfocus", "tobagoMenuFocus(event)", null);
- writer.writeAttribute("onblur", "tobagoMenuBlur(event)", null);
- writer.writeAttribute("onkeydown", "tobagoMenuKeyDown(event)", null);
- writer.writeAttribute("onkeypress", "tobagoMenuKeyPress(event)", null);
+ writer.writeAttribute(HtmlAttributes.HREF, "#", null);
+ writer.writeAttribute(HtmlAttributes.ONFOCUS, "tobagoMenuFocus(event)", null);
+ writer.writeAttribute(HtmlAttributes.ONBLUR, "tobagoMenuBlur(event)", null);
+ writer.writeAttribute(HtmlAttributes.ONKEYDOWN, "tobagoMenuKeyDown(event)", null);
+ writer.writeAttribute(HtmlAttributes.ONKEYPRESS, "tobagoMenuKeyPress(event)", null);
if (label.getText() != null) {
HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
}
- writer.endElement("a");
+ writer.endElement(HtmlConstants.A);
facesContext.setResponseWriter(savedWriter);
final String html = stringWriter.toString();
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -27,6 +27,7 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.MessageRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.application.FacesMessage;
@@ -72,23 +73,23 @@
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("span", component);
+ writer.startElement(HtmlConstants.SPAN, component);
writer.writeClassAttribute("tobago-validation-message");
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
while (iterator.hasNext()) {
FacesMessage message = (FacesMessage) iterator.next();
// MessageFormat detail = new MessageFormat(formatString, tobagoContext.getLocale());
writer.startElement(HtmlConstants.LABEL, null);
- writer.writeAttribute("for", clientId, null);
- writer.writeAttribute("title", message.getDetail(), null);
+ writer.writeAttribute(HtmlAttributes.FOR, clientId, null);
+ writer.writeAttribute(HtmlAttributes.TITLE, message.getDetail(), null);
writer.writeText(message.getSummary(), null);
writer.endElement(HtmlConstants.LABEL);
- writer.startElement("br", null);
- writer.endElement("br");
+ writer.startElement(HtmlConstants.BR, null);
+ writer.endElement(HtmlConstants.BR);
}
- writer.endElement("span");
+ 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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -26,6 +26,7 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.MessageRendererBase;
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.commons.logging.Log;
@@ -67,9 +68,9 @@
LOG.debug("facesContect is " + facesContext.getClass().getName());
}
if (facesContext.getMessages().hasNext()) { // in ie empty span gets a height
- writer.startElement("span", component);
+ writer.startElement(HtmlConstants.SPAN, component);
writer.writeClassAttribute("tobago-validation-message");
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
// with id
String focusId = null;
@@ -92,7 +93,7 @@
ComponentUtil.findPage(component).setFocusId(focusId);
}
- writer.endElement("span");
+ writer.endElement(HtmlConstants.SPAN);
}
}
@@ -113,13 +114,13 @@
throws IOException {
writer.startElement(HtmlConstants.LABEL, null);
if (clientId != null) {
- writer.writeAttribute("for", clientId, null);
+ writer.writeAttribute(HtmlAttributes.FOR, clientId, null);
}
- writer.writeAttribute("title", message.getDetail(), null);
+ writer.writeAttribute(HtmlAttributes.TITLE, message.getDetail(), null);
writer.writeText(message.getSummary(), null);
writer.endElement(HtmlConstants.LABEL);
- writer.startElement("br", null);
- writer.endElement("br");
+ 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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -21,6 +21,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TARGET;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -31,22 +33,22 @@
public void encodeEndTobago(FacesContext facesContext, UIComponent component)
throws IOException {
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("iframe", component);
- writer.writeAttribute("src", null, ATTR_TARGET);
+ writer.startElement(HtmlConstants.IFRAME, component);
+ writer.writeAttribute(HtmlAttributes.SRC, null, ATTR_TARGET);
writer.writeComponentClass();
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
String noframes = ResourceManagerUtil.getPropertyNotNull(
facesContext, "tobago", "browser.noframe.message.prefix");
writer.writeText(noframes + " ", null);
- writer.startElement("a", component);
- writer.writeAttribute("href", null, ATTR_TARGET);
+ writer.startElement(HtmlConstants.A, component);
+ writer.writeAttribute(HtmlAttributes.HREF, null, ATTR_TARGET);
writer.writeText(null, ATTR_TARGET);
- writer.endElement("a");
+ writer.endElement(HtmlConstants.A);
noframes = ResourceManagerUtil.getPropertyNotNull(
facesContext, "tobago", "browser.noframe.message.postfix");
writer.writeText(" " + noframes, null);
- writer.endElement("iframe");
+ writer.endElement(HtmlConstants.IFRAME);
}
}
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -27,6 +27,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.renderkit.RendererBase;
+import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -51,10 +53,10 @@
component, ATTR_CREATE_SPAN);
if (createSpan) {
- writer.startElement("span", component);
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.startElement(HtmlConstants.SPAN, component);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
writer.writeComponentClass();
- writer.writeAttribute("title", null, ATTR_TIP);
+ writer.writeAttribute(HtmlAttributes.TITLE, null, ATTR_TIP);
}
if (escape) {
StringTokenizer tokenizer = new StringTokenizer(text, "\n\r");
@@ -69,7 +71,7 @@
writer.write(text);
}
if (createSpan) {
- writer.endElement("span");
+ writer.endElement(HtmlConstants.SPAN);
}
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?view=diff&rev=449215&r1=449214&r2=449215
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Sat Sep 23 03:44:27 2006
@@ -39,6 +39,8 @@
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
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.util.AccessKeyMap;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -172,36 +174,36 @@
writer.write('\n');
}
- writer.startElement("html", null);
- writer.startElement("head", null);
+ writer.startElement(HtmlConstants.HTML, null);
+ writer.startElement(HtmlConstants.HEAD, null);
HtmlRendererUtil.writeJavascript(writer, "var TbgHeadStart = new Date();");
// meta
// TODO duplicate; see PageTag.doStartTag()
-// writer.startElement("meta", null);
+// writer.startElement(HtmlConstants.META, null);
// writer.writeAttribute("http-equiv", "Content-Type", null);
// writer.writeAttribute(
// "content", generateContentType(facesContext, charset), null);
-// writer.endElement("meta");
+// writer.endElement(HtmlConstants.META);
response.setContentType(generateContentType(facesContext, charset));
// title
- writer.startElement("title", null);
+ writer.startElement(HtmlConstants.TITLE, null);
writer.writeText(title != null ? title : "", null);
- writer.endElement("title");
+ writer.endElement(HtmlConstants.TITLE);
// style files
for (String styleFile : page.getStyleFiles()) {
List<String> styles = ResourceManagerUtil.getStyles(facesContext, styleFile);
for (String styleString : styles) {
if (styleString.length() > 0) {
- writer.startElement("link", null);
- writer.writeAttribute("rel", "stylesheet", null);
- writer.writeAttribute("href", styleString, null);
- writer.writeAttribute("media", "screen", null);
- writer.writeAttribute("type", "text/css", null);
- writer.endElement("link");
+ writer.startElement(HtmlConstants.LINK, null);
+ writer.writeAttribute(HtmlAttributes.REL, "stylesheet", null);
+ writer.writeAttribute(HtmlAttributes.HREF, styleString, null);
+ writer.writeAttribute(HtmlAttributes.MEDIA, "screen", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "text/css", null);
+ writer.endElement(HtmlConstants.LINK);
}
}
}
@@ -209,11 +211,11 @@
// style sniplets
Set<String> styleBlocks = page.getStyleBlocks();
if (styleBlocks.size() > 0) {
- writer.startElement("style", null);
+ writer.startElement(HtmlConstants.STYLE, null);
for (String cssBlock : styleBlocks) {
writer.write(cssBlock);
}
- writer.endElement("style");
+ writer.endElement(HtmlConstants.STYLE);
}
// script files
@@ -288,13 +290,13 @@
// writer.endElement("script");
String defaultActionId = page.getDefaultActionId() != null
? page.getDefaultActionId() : "";
- writer.endElement("head");
- writer.startElement("body", page);
- writer.writeAttribute("onload",
+ writer.endElement(HtmlConstants.HEAD);
+ writer.startElement(HtmlConstants.BODY, page);
+ writer.writeAttribute(HtmlAttributes.ONLOAD,
"Tobago.init('" + clientId + "');", null);
// writer.writeAttribute("onunload", "Tobago.onexit();", null);
//this ist for ie to prevent scrollbars where none are needed
- writer.writeAttribute("scroll", "auto", null);
+ writer.writeAttribute(HtmlAttributes.SCROLL, "auto", null);
writer.writeComponentClass();
writer.writeIdAttribute(clientId);
@@ -314,46 +316,46 @@
}
HtmlRendererUtil.writeJavascript(writer, "TbgTimer.startBody = new Date();");
- writer.startElement("form", page);
+ writer.startElement(HtmlConstants.FORM, page);
writer.writeNameAttribute(
clientId + SUBCOMPONENT_SEP + "form");
- writer.writeAttribute("action", formAction, null);
+ writer.writeAttribute(HtmlAttributes.ACTION, formAction, null);
writer.writeIdAttribute(page.getFormId(facesContext));
- writer.writeAttribute("method", getMethod(page), null);
- writer.writeAttribute("enctype", null, ATTR_ENCTYPE);
+ writer.writeAttribute(HtmlAttributes.METHOD, getMethod(page), null);
+ writer.writeAttribute(HtmlAttributes.ENCTYPE, null, ATTR_ENCTYPE);
// TODO: enable configuration of 'accept-charset'
- writer.writeAttribute("accept-charset", FORM_ACCEPT_CHARSET, null);
+ writer.writeAttribute(HtmlAttributes.ACCEPT_CHARSET, FORM_ACCEPT_CHARSET, null);
- writer.startElement("input", null);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(
clientId + SUBCOMPONENT_SEP + "form-action");
writer.writeIdAttribute(
clientId + SUBCOMPONENT_SEP + "form-action");
- writer.writeAttribute("value", defaultActionId, null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, defaultActionId, null);
+ writer.endElement(HtmlConstants.INPUT);
if (debugMode) {
- writer.startElement("input");
- writer.writeAttribute("value", clientLogSeverity, null);
- writer.writeAttribute("id", clientId + SUBCOMPONENT_SEP + "clientSeverity", null);
- writer.writeAttribute("name", clientId + SUBCOMPONENT_SEP + "clientSeverity", null);
- writer.writeAttribute("type", "hidden", null);
- writer.endElement("input");
+ writer.startElement(HtmlConstants.INPUT);
+ writer.writeAttribute(HtmlAttributes.VALUE, clientLogSeverity, null);
+ writer.writeAttribute(HtmlAttributes.ID, clientId + SUBCOMPONENT_SEP + "clientSeverity", null);
+ writer.writeAttribute(HtmlAttributes.NAME, clientId + SUBCOMPONENT_SEP + "clientSeverity", null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
+ writer.endElement(HtmlConstants.INPUT);
}
// TODO: this is needed for the "BACK-BUTTON-PROBLEM"
// but may no longer needed
/*
if (ViewHandlerImpl.USE_VIEW_MAP) {
- writer.startElement("input", null);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(ViewHandlerImpl.PAGE_ID);
writer.writeIdAttribute(ViewHandlerImpl.PAGE_ID);
Object value = facesContext.getViewRoot().getAttributes().get(
ViewHandlerImpl.PAGE_ID);
- writer.writeAttribute("value", (value != null ? value : ""), null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, (value != null ? value : ""), null);
+ writer.endElement(HtmlConstants.INPUT);
}
*/
@@ -367,7 +369,7 @@
// facesContext.getApplication().getViewHandler().writeState(facesContext);
- writer.endElement("form");
+ writer.endElement(HtmlConstants.FORM);
// debugging...
if (debugMode) {
@@ -392,8 +394,8 @@
}
HtmlRendererUtil.writeJavascript(writer, "TbgTimer.endBody = new Date();");
- writer.endElement("body");
- writer.endElement("html");
+ writer.endElement(HtmlConstants.BODY);
+ writer.endElement(HtmlConstants.HTML);
if (LOG.isDebugEnabled()) {
LOG.debug("unused AccessKeys : "
@@ -435,10 +437,10 @@
}
for (String scriptString : scripts) {
if (scriptString.length() > 0) {
- writer.startElement("script", null);
- writer.writeAttribute("src", scriptString, null);
- writer.writeAttribute("type", "text/javascript", null);
- writer.endElement("script");
+ writer.startElement(HtmlConstants.SCRIPT, null);
+ writer.writeAttribute(HtmlAttributes.SRC, scriptString, null);
+ writer.writeAttribute(HtmlAttributes.TYPE, "text/javascript", null);
+ writer.endElement(HtmlConstants.SCRIPT);
}
}
}
@@ -450,8 +452,8 @@
private void errorMessageForDebugging(String id, FacesMessage message,
ResponseWriter writer) throws IOException {
- writer.startElement("div", null);
- writer.writeAttribute("style", "color: red", null);
+ writer.startElement(HtmlConstants.DIV, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "color: red", null);
writer.write("[");
writer.write(id != null ? id : "null");
writer.write("]");
@@ -460,9 +462,9 @@
writer.write("/");
writer.write(message.getDetail() == null ? "null" : message.getDetail());
writer.write("]");
- writer.endElement("div");
- writer.startElement("br", null);
- writer.endElement("br");
+ writer.endElement(HtmlConstants.DIV);
+ writer.startElement(HtmlConstants.BR, null);
+ writer.endElement(HtmlConstants.BR);
}
private String errorMessageForDebugging(String id, FacesMessage message) {