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 [3/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...
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=449215&r1=449214&r2=449215
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java Sat Sep 23 03:44:27 2006
@@ -31,6 +31,8 @@
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
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;
@@ -62,9 +64,9 @@
}
TobagoResponseWriter writer
= (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("div", tree);
+ writer.startElement(HtmlConstants.DIV, tree);
writer.writeComponentClass();
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
StringBuffer value = new StringBuffer(";");
List<UITreeNode> expandPath = tree.getExpandPath();
@@ -73,12 +75,12 @@
value.append(";");
}
- writer.startElement("input", tree);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, tree);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
- writer.writeAttribute("value", value, null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, value, null);
+ writer.endElement(HtmlConstants.INPUT);
final Set<DefaultMutableTreeNode> selection = tree.getState().getSelection();
@@ -87,12 +89,12 @@
value.append(nodeStateId(facesContext, tree.findUITreeNode(root, node)));
value.append(";");
}
- writer.startElement("input", tree);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, tree);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(clientId + UITreeListbox.SELECT_STATE);
writer.writeIdAttribute(clientId + UITreeListbox.SELECT_STATE);
- writer.writeAttribute("value", value, null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, value, null);
+ writer.endElement(HtmlConstants.INPUT);
String script = createJavascript(facesContext, clientId, root);
@@ -154,20 +156,20 @@
// int cols = 4;
//
//
-// writer.startElement("table", tree);
-// writer.writeAttribute("cellpadding", "0", null);
-// writer.writeAttribute("cellspacing", "0", null);
-// writer.writeAttribute("border", "0", null);
-// writer.writeAttribute("summary", "", null);
+// writer.startElement(HtmlConstants.TABLE, tree);
+// writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
+// writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
+// writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+// writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
// writer.writeComponentClass(ATTR_STYLE_CLASS);
-// writer.startElement("tr", null);
+// writer.startElement(HtmlConstants.TR, null);
//
//
// String clientId = tree.getClientId(facesContext);
//
// for (int level = 0; level < depth; level++) {
//
-// writer.startElement("td", null);
+// writer.startElement(HtmlConstants.TD, null);
//
//
//
@@ -175,16 +177,16 @@
//
//
//
-// writer.endElement("td");
+// writer.endElement(HtmlConstants.TD);
// if ((level + 1) % cols == 0) {
-// writer.endElement("tr");
-// writer.startElement("tr", null);
+// writer.endElement(HtmlConstants.TR);
+// writer.startElement(HtmlConstants.TR, null);
// }
// }
//
//
-// writer.endElement("tr");
-// writer.endElement("table");
+// writer.endElement(HtmlConstants.TR);
+// writer.endElement(HtmlConstants.TABLE);
//
// // ///////////////////////////////////////////////////
// // end of layouted list containers
@@ -195,7 +197,7 @@
public void encodeEndTobago(FacesContext facesContext,
UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
}
// private void renderListbox(ResponseWriter writer, String clientId, int level,
@@ -211,12 +213,12 @@
//
// String listboxId = clientId + SUBCOMPONENT_SEP + "cont_" + level;
// String onChange = "tobagoTreeListboxChange(this, '" + clientId + "')";
-// writer.startElement("select", null);
+// writer.startElement(HtmlConstants.SELECT, null);
// writer.writeIdAttribute(listboxId);
// writer.writeClassAttribute(className);
-// writer.writeAttribute("style" , "width: 150px; height: 100px;", null);
-// writer.writeAttribute("size", "2", null);
-// writer.writeAttribute("onchange", onChange, null);
+// writer.writeAttribute(HtmlAttributes.STYLE , "width: 150px; height: 100px;", null);
+// writer.writeAttribute(HtmlAttributes.SIZE, "2", null);
+// writer.writeAttribute(HtmlAttributes.ONCHANGE, onChange, null);
//
//
//
@@ -227,10 +229,10 @@
// UITreeNode treeNode = (UITreeNode) nodes.get(i);
// DefaultMutableTreeNode node = treeNode.getTreeNode();
//
-// writer.startElement("option", null);
-// writer.writeAttribute("value", Integer.toString(i), null);
+// writer.startElement(HtmlConstants.OPTION, null);
+// writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(i), null);
// if (treeNode.equals(tree.getSelectedNode(level))) {
-// writer.writeAttribute("selected", "selected", null);
+// writer.writeAttribute(HtmlAttributes.SELECTED, "selected", null);
// }
//
// writer.writeText(treeNode.getAttributes().get(ATTR_NAME), null);
@@ -238,13 +240,13 @@
// writer.writeText(" -->", null);
// }
//
-// writer.endElement("option");
+// writer.endElement(HtmlConstants.OPTION);
// }
//
// }
//
//
-// writer.endElement("select");
+// writer.endElement(HtmlConstants.SELECT);
// }
// ///////////////////////////////////////////// bean getter + setter
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=449215&r1=449214&r2=449215
==============================================================================
--- 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 Sat Sep 23 03:44:27 2006
@@ -34,6 +34,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.component.NamingContainer;
@@ -111,38 +113,38 @@
TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
- writer.startElement("div", tree);
+ writer.startElement(HtmlConstants.DIV, tree);
writer.writeComponentClass();
- writer.writeAttribute("style", null, ATTR_STYLE);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
- writer.startElement("input", tree);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, tree);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
- writer.writeAttribute("value", ";", null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, ";", null);
+ writer.endElement(HtmlConstants.INPUT);
- writer.startElement("input", tree);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, tree);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(clientId + UITree.MARKER);
writer.writeIdAttribute(clientId + UITree.MARKER);
- writer.writeAttribute("value", "", null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, "", null);
+ writer.endElement(HtmlConstants.INPUT);
if (isSelectable(tree)) {
- writer.startElement("input", tree);
- writer.writeAttribute("type", "hidden", null);
+ writer.startElement(HtmlConstants.INPUT, tree);
+ writer.writeAttribute(HtmlAttributes.TYPE, "hidden", null);
writer.writeNameAttribute(clientId + UITree.SELECT_STATE);
writer.writeIdAttribute(clientId + UITree.SELECT_STATE);
- writer.writeAttribute("value", ";", null);
- writer.endElement("input");
+ writer.writeAttribute(HtmlAttributes.VALUE, ";", null);
+ writer.endElement(HtmlConstants.INPUT);
}
if (ComponentUtil.getBooleanAttribute(tree, ATTR_MUTABLE)) {
-// writer.startElement("div", null);
-// writer.writeAttribute("style", "border: 2px groove #ddeeff", null);
+// writer.startElement(HtmlConstants.DIV, null);
+// writer.writeAttribute(HtmlAttributes.STYLE, "border: 2px groove #ddeeff", null);
// writer.writeText("", null);
UIComponent toolbar = tree.getFacet("mutableToolbar");
@@ -152,24 +154,24 @@
RenderUtil.encode(facesContext, toolbar);
-// writer.endElement("div");
+// writer.endElement(HtmlConstants.DIV);
}
-// writer.startElement("div", null);
- writer.startElement("table", tree);
- writer.writeAttribute("cellpadding", "0", null);
- writer.writeAttribute("cellspacing", "0", null);
- writer.writeAttribute("border", "0", null);
- writer.writeAttribute("summary", "", null);
+// writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlConstants.TABLE, tree);
+ writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", null);
+ writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", null);
+ writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.SUMMARY, "", null);
writer.writeComponentClass();
- writer.startElement("tr", null);
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlConstants.TD, null);
writer.writeIdAttribute(clientId + "-cont");
writer.writeComment("placeholder for treecontent");
- writer.endElement("td");
- writer.endElement("tr");
- writer.endElement("table");
-// writer.endElement("div");
+ writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlConstants.TR);
+ writer.endElement(HtmlConstants.TABLE);
+// writer.endElement(HtmlConstants.DIV);
String[] script = createJavascript(facesContext, clientId, root);
@@ -188,7 +190,7 @@
HtmlRendererUtil.writeScriptLoader(facesContext, scripts, script);
}
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
}
private String[] createJavascript(FacesContext facesContext, String clientId,
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=449215&r1=449214&r2=449215
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Sat Sep 23 03:44:27 2006
@@ -36,6 +36,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;
@@ -76,10 +78,10 @@
String clientId = component.getClientId(facesContext);
- writer.startElement("div", component);
+ writer.startElement(HtmlConstants.DIV, component);
writer.writeComponentClass();
writer.writeIdAttribute(clientId);
- writer.writeAttribute("style", style, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, style, null);
HtmlRendererUtil.writeJavascript(writer,
"Tobago.addAjaxComponent(\"" + clientId + "\")");
@@ -92,22 +94,22 @@
renderBoxHeader(facesContext, writer, component);
- writer.startElement("div", component);
+ writer.startElement(HtmlConstants.DIV, component);
writer.writeClassAttribute("tobago-box-content");
-// writer.writeAttribute("style", null, TobagoConstants.ATTR_STYLE_BODY);
- writer.startElement("div", component);
+// writer.writeAttribute(HtmlAttributes.STYLE, null, TobagoConstants.ATTR_STYLE_BODY);
+ writer.startElement(HtmlConstants.DIV, component);
writer.writeClassAttribute("tobago-box-content-inner");
- writer.writeAttribute("style", null, ATTR_STYLE_INNER);
+ writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE_INNER);
}
protected void renderBoxHeader(FacesContext facesContext,
TobagoResponseWriter writer, UIComponent component) throws IOException {
- writer.startElement("div", component);
+ writer.startElement(HtmlConstants.DIV, component);
writer.writeClassAttribute("tobago-box-header");
UIComponent label = component.getFacet(FACET_LABEL);
- writer.startElement("span", null);
+ writer.startElement(HtmlConstants.SPAN, null);
writer.writeClassAttribute("tobago-box-header-label");
String labelString
= (String) component.getAttributes().get(ATTR_LABEL);
@@ -116,13 +118,13 @@
} else if (labelString != null) {
writer.writeText(labelString, null);
}
- writer.endElement("span");
+ writer.endElement(HtmlConstants.SPAN);
UIPanel toolbar = (UIPanel) component.getFacet(FACET_TOOL_BAR);
if (toolbar != null) {
renderToolbar(facesContext, writer, toolbar);
}
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
}
public void encodeEndTobago(FacesContext facesContext,
@@ -131,12 +133,12 @@
encodeEndInner(writer);
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
}
private void encodeEndInner(ResponseWriter writer) throws IOException {
- writer.endElement("div");
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlConstants.DIV);
}
protected void renderToolbar(FacesContext facesContext,
@@ -146,7 +148,7 @@
if (ToolBarTag.LABEL_OFF.equals(attributes.get(ATTR_LABEL_POSITION))) {
className += " tobago-box-header-toolbar-label_off";
}
- writer.startElement("div", null);
+ writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute(className);
attributes.put(ATTR_SUPPPRESS_TOOLBAR_CONTAINER, Boolean.TRUE);
if (ToolBarTag.LABEL_BOTTOM.equals(attributes.get(ATTR_LABEL_POSITION))) {
@@ -156,7 +158,7 @@
attributes.put(ATTR_ICON_SIZE, ToolBarTag.ICON_SMALL);
}
RenderUtil.encode(facesContext, toolbar);
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
}
public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java?view=diff&rev=449215&r1=449214&r2=449215
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/LabeledInputLayoutRenderer.java Sat Sep 23 03:44:27 2006
@@ -27,6 +27,8 @@
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
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;
@@ -64,68 +66,68 @@
= ClientProperties.getInstance(FacesContext.getCurrentInstance());
if (!inline) {
- writer.startElement("table", input);
- 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(HtmlConstants.TABLE, input);
+ 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);
if (label != null) {
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.TD, null);
writer.writeClassAttribute("tobago-label-td");
- writer.writeAttribute("valign", "top", null);
+ writer.writeAttribute(HtmlAttributes.VALIGN, "top", null);
writer.writeText("", null); // to ensure that the start-tag is closed!
RenderUtil.encode(facesContext, label);
- writer.endElement("td");
- writer.startElement("td", null);
- writer.startElement("img", null);
- writer.writeAttribute("src", image, null);
- writer.writeAttribute("border", "0", null);
- writer.writeAttribute("height", "1", null);
- writer.writeAttribute("width", "5", null);
- writer.endElement("img");
- writer.endElement("td");
+ writer.endElement(HtmlConstants.TD);
+ writer.startElement(HtmlConstants.TD, null);
+ writer.startElement(HtmlConstants.IMG, null);
+ writer.writeAttribute(HtmlAttributes.SRC, image, null);
+ writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.HEIGHT, "1", null);
+ writer.writeAttribute(HtmlAttributes.WIDTH, "5", null);
+ writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlConstants.TD);
}
- writer.startElement("td", null);
- writer.writeAttribute("valign", "top", null);
- writer.writeAttribute("rowspan", "2", null);
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.VALIGN, "top", null);
+ writer.writeAttribute(HtmlAttributes.ROWSPAN, "2", null);
writer.writeText("", null); // to ensure that the start-tag is closed!
renderComponent(facesContext, input);
if (picker != null) {
- writer.endElement("td");
- writer.startElement("td", null);
- writer.writeAttribute("valign", "top", null);
- writer.writeAttribute("rowspan", "2", null);
- writer.writeAttribute("style", "padding-left: 5px;", null);
+ writer.endElement(HtmlConstants.TD);
+ writer.startElement(HtmlConstants.TD, null);
+ writer.writeAttribute(HtmlAttributes.VALIGN, "top", null);
+ writer.writeAttribute(HtmlAttributes.ROWSPAN, "2", null);
+ writer.writeAttribute(HtmlAttributes.STYLE, "padding-left: 5px;", null);
renderPicker(facesContext, input, picker);
}
- writer.endElement("td");
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlConstants.TR);
if ("sap".equals(client.getTheme().getName())) { // FIXME: "sap"
- writer.startElement("tr", null);
+ writer.startElement(HtmlConstants.TR, null);
if (label != null) {
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.TD, null);
writer.writeClassAttribute("tobago-label-td-underline-label");
- writer.startElement("img", null);
- writer.writeAttribute("src", image, null);
- writer.writeAttribute("border", "0", null);
- writer.writeAttribute("height", "1", null);
- writer.endElement("img");
- writer.endElement("td");
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.IMG, null);
+ writer.writeAttribute(HtmlAttributes.SRC, image, null);
+ writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.HEIGHT, "1", null);
+ writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlConstants.TD);
+ writer.startElement(HtmlConstants.TD, null);
writer.writeClassAttribute("tobago-label-td-underline-spacer");
- writer.startElement("img", null);
- writer.writeAttribute("src", image, null);
- writer.writeAttribute("border", "0", null);
- writer.writeAttribute("height", "1", null);
- writer.endElement("img");
- writer.endElement("td");
+ writer.startElement(HtmlConstants.IMG, null);
+ writer.writeAttribute(HtmlAttributes.SRC, image, null);
+ writer.writeAttribute(HtmlAttributes.BORDER, "0", null);
+ writer.writeAttribute(HtmlAttributes.HEIGHT, "1", null);
+ writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlConstants.TD);
}
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TR);
}
- writer.endElement("table");
+ writer.endElement(HtmlConstants.TABLE);
} else {
renderComponent(facesContext, input);
renderPicker(facesContext, input, picker);
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java?view=diff&rev=449215&r1=449214&r2=449215
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java Sat Sep 23 03:44:27 2006
@@ -27,6 +27,8 @@
import org.apache.myfaces.tobago.component.UIPanel;
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.context.FacesContext;
@@ -42,36 +44,36 @@
String bodyStyle = (String)
activeTab.getParent().getAttributes().get(ATTR_STYLE_BODY);
- writer.startElement("tr", null);
- writer.startElement("td", null);
+ writer.startElement(HtmlConstants.TR, null);
+ writer.startElement(HtmlConstants.TD, null);
if (bodyStyle != null) {
- writer.writeAttribute("style", bodyStyle, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, bodyStyle, null);
}
- writer.startElement("div", null);
+ writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-tab-shadow");
if (bodyStyle != null) {
- writer.writeAttribute("style", bodyStyle, null);
+ writer.writeAttribute(HtmlAttributes.STYLE, bodyStyle, null);
}
- writer.startElement("div", null);
+ writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-tab-content");
String height = HtmlRendererUtil.getStyleAttributeValue(bodyStyle, "height");
if (height != null) {
- writer.writeAttribute("style", "height: "
+ writer.writeAttribute(HtmlAttributes.STYLE, "height: "
+ (Integer.parseInt(height.replaceAll("\\D", ""))-1) + "px; overflow: auto;", null);
}
writer.writeText("", null);
RenderUtil.encodeChildren(facesContext, activeTab);
- writer.endElement("div");
- writer.endElement("div");
+ writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlConstants.DIV);
- writer.endElement("td");
- writer.endElement("tr");
+ writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlConstants.TR);
}