You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/07/29 14:25:28 UTC
svn commit: r980422 [3/3] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html...
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Thu Jul 29 12:25:26 2010
@@ -39,7 +39,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
@@ -182,12 +182,12 @@ public abstract class ToolBarRendererBas
width = renderToolbarButton(facesContext, toolBar, command, writer, checked, onClick, null, width);
}
- writer.startElement(HtmlConstants.INPUT, null);
+ writer.startElement(HtmlElements.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
writer.writeIdAttribute(radioId);
writer.writeNameAttribute(radioId);
writer.writeAttribute(HtmlAttributes.VALUE, currentValue, true);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
return width;
}
@@ -215,12 +215,12 @@ public abstract class ToolBarRendererBas
width = renderToolbarButton(facesContext, toolBar, command, writer, checked, onClick, null, width);
- writer.startElement(HtmlConstants.INPUT, null);
+ writer.startElement(HtmlElements.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.HIDDEN, false);
writer.writeIdAttribute(clientId);
writer.writeNameAttribute(clientId);
writer.writeAttribute(HtmlAttributes.VALUE, Boolean.toString(checked), false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
return width;
}
@@ -368,7 +368,7 @@ public abstract class ToolBarRendererBas
}
// start rendering
- writer.startElement(HtmlConstants.SPAN, command);
+ writer.startElement(HtmlElements.SPAN, command);
Markup itemMarkup = Markup.NULL;
if (selected) {
itemMarkup = itemMarkup.add(Markup.SELECTED);
@@ -380,13 +380,13 @@ public abstract class ToolBarRendererBas
HtmlRendererUtils.renderTip(command, writer);
writer.writeStyleAttribute(itemStyle);
- writer.startElement(HtmlConstants.SPAN, command);
+ writer.startElement(HtmlElements.SPAN, command);
writer.writeClassAttribute(Classes.create(toolBar, "button", selected ? Markup.SELECTED : Markup.NULL));
writer.writeStyleAttribute(buttonStyle);
writer.writeAttribute(HtmlAttributes.ONCLICK, commandClick != null ? commandClick : menuClick, true);
// render icon
if (showIcon && iconName != null) {
- writer.startElement(HtmlConstants.IMG, command);
+ writer.startElement(HtmlElements.IMG, command);
writer.writeAttribute(HtmlAttributes.SRC, image, false);
String imageHover
= ResourceManagerUtils.getImageWithPath(facesContext, HtmlRendererUtils.createSrc(iconName, "Hover"), true);
@@ -396,23 +396,23 @@ public abstract class ToolBarRendererBas
}
writer.writeAttribute(HtmlAttributes.ALT, label.getText(), true);
writer.writeStyleAttribute(iconStyle);
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
// render label
if (showLabel) {
- writer.startElement(HtmlConstants.SPAN, command);
+ writer.startElement(HtmlElements.SPAN, command);
writer.writeClassAttribute(Classes.create(toolBar, "label"));
writer.writeStyleAttribute(labelStyle);
if (label.getText() != null) {
HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
}
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
}
if (separateButtons) {
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
- writer.startElement(HtmlConstants.SPAN, command);
+ writer.startElement(HtmlElements.SPAN, command);
writer.writeClassAttribute(Classes.create(toolBar, "menu"));
writer.writeStyleAttribute(menuStyle);
writer.writeAttribute(HtmlAttributes.TYPE, "button", false);
@@ -421,15 +421,15 @@ public abstract class ToolBarRendererBas
// render sub menu popup button
if (dropDownMenu != null) {
- writer.startElement(HtmlConstants.IMG, command);
+ writer.startElement(HtmlElements.IMG, command);
String menuImage = ResourceManagerUtils.getImageWithPath(facesContext, "image/toolbarButtonMenu.gif");
writer.writeAttribute(HtmlAttributes.SRC, menuImage, false);
writer.writeStyleAttribute(openerStyle);
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
renderDropDownMenu(facesContext, writer, dropDownMenu);
}
- writer.endElement(HtmlConstants.SPAN);
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
+ writer.endElement(HtmlElements.SPAN);
return width.add(itemStyle.getWidth()).add(2); // XXX
// computation of the width of the toolBar will not be used in the moment.
@@ -443,18 +443,18 @@ public abstract class ToolBarRendererBas
return width;
}
- writer.startElement(HtmlConstants.SPAN, separator);
+ writer.startElement(HtmlElements.SPAN, separator);
writer.writeClassAttribute(Classes.create(toolBar, "item", Markup.DISABLED));
Style itemStyle = new Style();
itemStyle.setHeight(getItemHeight(facesContext, toolBar));
itemStyle.setWidth(Measure.valueOf(10));
writer.writeStyleAttribute(itemStyle);
- writer.startElement(HtmlConstants.SPAN, separator);
+ writer.startElement(HtmlElements.SPAN, separator);
writer.writeClassAttribute(Classes.create(toolBar, "separator"));
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
- writer.endElement(HtmlConstants.SPAN);
+ writer.endElement(HtmlElements.SPAN);
return width.add(itemStyle.getWidth()).add(2); // XXX
// computation of the width of the toolBar will not be used in the moment.
@@ -576,11 +576,11 @@ public abstract class ToolBarRendererBas
private void renderDropDownMenu(FacesContext facesContext, TobagoResponseWriter writer, AbstractUIMenu dropDownMenu)
throws IOException {
- writer.startElement(HtmlConstants.OL, dropDownMenu);
+ writer.startElement(HtmlElements.OL, dropDownMenu);
// XXX fix naming conventions for CSS classes
writer.writeClassAttribute("tobago-menuBar tobago-menu-dropDownMenu");
RenderUtils.encode(facesContext, dropDownMenu);
- writer.endElement(HtmlConstants.OL);
+ writer.endElement(HtmlElements.OL);
}
@Override
Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java Thu Jul 29 12:25:26 2010
@@ -27,7 +27,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Position;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -81,39 +81,39 @@ public class TreeListboxRenderer extends
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.DIV, tree);
+ writer.startElement(HtmlElements.DIV, tree);
writer.writeClassAttribute(Classes.create(tree));
Style style = new Style(facesContext, tree);
writer.writeStyleAttribute(style);
- writer.startElement(HtmlConstants.INPUT, tree);
+ writer.startElement(HtmlElements.INPUT, tree);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
writer.writeAttribute(HtmlAttributes.VALUE, ";", false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
- writer.startElement(HtmlConstants.INPUT, tree);
+ writer.startElement(HtmlElements.INPUT, tree);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + AbstractUITree.MARKER);
writer.writeIdAttribute(clientId + AbstractUITree.MARKER);
writer.writeAttribute(HtmlAttributes.VALUE, "", false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
if (isSelectable(tree)) {
- writer.startElement(HtmlConstants.INPUT, tree);
+ writer.startElement(HtmlElements.INPUT, tree);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + AbstractUITree.SELECT_STATE);
writer.writeIdAttribute(clientId + AbstractUITree.SELECT_STATE);
writer.writeAttribute(HtmlAttributes.VALUE, ";", false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
HtmlRendererUtils.writeScriptLoader(facesContext, SCRIPT);
RenderUtils.encode(facesContext, root);
- writer.startElement(HtmlConstants.DIV, tree);
+ writer.startElement(HtmlElements.DIV, tree);
Style scrollDivStyle = new Style();
scrollDivStyle.setWidth(Measure.valueOf(6 * 160)); // todo: depth * width of a select
scrollDivStyle.setHeight(style.getHeight() // todo: what, when there is no scrollbar?
@@ -125,7 +125,7 @@ public class TreeListboxRenderer extends
// write in all open branches the end tag.
while (divider.activateBranch(facesContext)) {
writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
}
while (divider.passivateBranch(facesContext)) {
}
@@ -134,9 +134,9 @@ public class TreeListboxRenderer extends
writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
}
// XXX can be removed?
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Thu Jul 29 12:25:26 2010
@@ -37,7 +37,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
@@ -126,7 +126,7 @@ public class TreeNodeRenderer extends Co
boolean expanded = isExpanded(tree, node);
if (level > 0) { // root will not rendered as an option
- writer.startElement(HtmlConstants.OPTION, null);
+ writer.startElement(HtmlElements.OPTION, null);
// todo: define where to store the selection of a tree, node.getValue() seems not to be a god place.
// writer.writeAttribute(HtmlAttributes.VALUE, node.getValue().toString(), true); // XXX converter?
writer.writeIdAttribute(id);
@@ -135,7 +135,7 @@ public class TreeNodeRenderer extends Co
if (folder) {
writer.writeText(" \u2192");
}
- writer.endElement(HtmlConstants.OPTION);
+ writer.endElement(HtmlElements.OPTION);
}
if (folder) {
@@ -144,7 +144,7 @@ public class TreeNodeRenderer extends Co
boolean alreadyExists = divider.activateBranch(facesContext);
writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (!alreadyExists) {
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(tree, "level"));
Style levelStyle = new Style();
levelStyle.setLeft(Measure.valueOf(level * 160)); // xxx 160 should be configurable
@@ -152,15 +152,15 @@ public class TreeNodeRenderer extends Co
// at the start of each div there is an empty and disabled select tag to show empty area.
// this is not needed for the 1st level.
if (level > 0) {
- writer.startElement(HtmlConstants.SELECT, null);
+ writer.startElement(HtmlElements.SELECT, null);
writer.writeAttribute(HtmlAttributes.DISABLED, true);
writer.writeAttribute(HtmlAttributes.SIZE, 2); // must be > 1, but the size comes from the layout
writer.writeClassAttribute(Classes.create(tree, "select"));
- writer.endElement(HtmlConstants.SELECT);
+ writer.endElement(HtmlElements.SELECT);
}
}
- writer.startElement(HtmlConstants.SELECT, node);
+ writer.startElement(HtmlElements.SELECT, node);
writer.writeIdAttribute(id + ComponentUtils.SUB_SEPARATOR + "select");
writer.writeClassAttribute(Classes.create(tree, "select"));
if (!expanded) {
@@ -171,9 +171,9 @@ public class TreeNodeRenderer extends Co
writer.writeAttribute(HtmlAttributes.MULTIPLE, siblingMode);
// XXX insert options here
- writer.startElement(HtmlConstants.OPTGROUP, null);
+ writer.startElement(HtmlElements.OPTGROUP, null);
writer.writeAttribute(HtmlAttributes.LABEL, node.getLabel(), true);
- writer.endElement(HtmlConstants.OPTGROUP);
+ writer.endElement(HtmlElements.OPTGROUP);
}
}
@@ -242,7 +242,7 @@ public class TreeNodeRenderer extends Co
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (showRoot || level != 0) {
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
// div id
writer.writeIdAttribute(id);
@@ -293,12 +293,12 @@ public class TreeNodeRenderer extends Co
RenderUtils.encode(facesContext, facet);
}
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
}
if (folder) {
String contentStyle = "display: " + (expanded ? "block" : "none") + ";";
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeIdAttribute(id + "-cont");
writer.writeStyleAttribute(contentStyle);
}
@@ -306,12 +306,12 @@ public class TreeNodeRenderer extends Co
private void encodeExpandedHidden(TobagoResponseWriter writer, UITreeNode node, String clientId,
boolean expanded) throws IOException {
- writer.startElement(HtmlConstants.INPUT, node);
+ writer.startElement(HtmlElements.INPUT, node);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + "-expanded");
writer.writeIdAttribute(clientId + "-expanded");
writer.writeAttribute(HtmlAttributes.VALUE, Boolean.toString(expanded), false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
private void encodeMenuIcon(
@@ -327,13 +327,13 @@ public class TreeNodeRenderer extends Co
onclick += ";" + objOnclick;
}
String src = expanded ? menuOpen : menuClose;
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(node, "menuIcon"));
writer.writeIdAttribute(id + "-menuIcon");
writer.writeAttribute("src", src, true);
writer.writeAttribute("onclick", onclick, true);
writer.writeAttribute("alt", "", false);
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
private void encodeIndent(
@@ -345,14 +345,14 @@ public class TreeNodeRenderer extends Co
String perpendicular = ResourceManagerUtils.getImageWithPath(facesContext, "image/I.gif");
for (Boolean junction : junctions) {
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(node, "junction"));
if (junction && !menuMode && showJunctions) {
writer.writeAttribute("src", perpendicular, true);
} else {
writer.writeAttribute("src", blank, true);
}
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
}
@@ -364,7 +364,7 @@ public class TreeNodeRenderer extends Co
if (!(!showJunctions
|| !showRootJunction && level == 0
|| !showRootJunction && !showRoot && level == 1)) {
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(node, "junction"));
writer.writeIdAttribute(id + "-junction");
@@ -385,7 +385,7 @@ public class TreeNodeRenderer extends Co
writer.writeAttribute("onclick", createOnclickForToggle(treeId, openSource, closedSource), true);
}
writer.writeAttribute("alt", "", false);
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
}
@@ -395,7 +395,7 @@ public class TreeNodeRenderer extends Co
throws IOException {
if (showIcons) {
- writer.startElement(HtmlConstants.IMG, null);
+ writer.startElement(HtmlElements.IMG, null);
writer.writeClassAttribute(Classes.create(node, "icon"));
writer.writeIdAttribute(id + "-icon"); //XXX may not okay with naming conventions
@@ -404,7 +404,7 @@ public class TreeNodeRenderer extends Co
writer.writeAttribute("onclick", createOnclickForToggle(treeId, openSource, closedSource), true);
}
writer.writeAttribute("alt", "", false);
- writer.endElement(HtmlConstants.IMG);
+ writer.endElement(HtmlElements.IMG);
}
}
@@ -435,7 +435,7 @@ public class TreeNodeRenderer extends Co
TobagoResponseWriter writer, CommandRendererHelper helper, UITreeNode node, boolean marked, String treeId)
throws IOException {
- writer.startElement(HtmlConstants.A, null);
+ writer.startElement(HtmlElements.A, null);
if (!helper.isDisabled()) {
writer.writeAttribute(HtmlAttributes.HREF, helper.getHref(), true);
writer.writeAttribute(HtmlAttributes.ONCLICK, helper.getOnclick(), true); // xxx is escaping required?
@@ -457,7 +457,7 @@ public class TreeNodeRenderer extends Co
label = "";
}
writer.writeText(label);
- writer.endElement(HtmlConstants.A);
+ writer.endElement(HtmlElements.A);
}
@Override
@@ -476,7 +476,7 @@ public class TreeNodeRenderer extends Co
if (folder) {
TobagoResponseWriterImpl writer
= (TobagoResponseWriterImpl) HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.endElement(HtmlConstants.SELECT);
+ writer.endElement(HtmlElements.SELECT);
ResponseWriterDivider divider = ResponseWriterDivider.getInstance(facesContext, TreeListboxRenderer.DIVIDER);
divider.passivateBranch(facesContext);
}
@@ -490,7 +490,7 @@ public class TreeNodeRenderer extends Co
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (folder) {
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
writer.writeComment("\nend of " + id + "-cont ");
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java Thu Jul 29 12:25:26 2010
@@ -24,7 +24,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -76,39 +76,39 @@ public class TreeRenderer extends Layout
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.DIV, tree);
+ writer.startElement(HtmlElements.DIV, tree);
writer.writeClassAttribute(Classes.create(tree));
Style style = new Style(facesContext, tree);
writer.writeStyleAttribute(style);
- writer.startElement(HtmlConstants.INPUT, tree);
+ writer.startElement(HtmlElements.INPUT, tree);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
writer.writeAttribute(HtmlAttributes.VALUE, ";", false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
- writer.startElement(HtmlConstants.INPUT, tree);
+ writer.startElement(HtmlElements.INPUT, tree);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + AbstractUITree.MARKER);
writer.writeIdAttribute(clientId + AbstractUITree.MARKER);
writer.writeAttribute(HtmlAttributes.VALUE, "", false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
if (isSelectable(tree)) {
- writer.startElement(HtmlConstants.INPUT, tree);
+ writer.startElement(HtmlElements.INPUT, tree);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeNameAttribute(clientId + AbstractUITree.SELECT_STATE);
writer.writeIdAttribute(clientId + AbstractUITree.SELECT_STATE);
writer.writeAttribute(HtmlAttributes.VALUE, ";", false);
- writer.endElement(HtmlConstants.INPUT);
+ writer.endElement(HtmlElements.INPUT);
}
HtmlRendererUtils.writeScriptLoader(facesContext, SCRIPT);
RenderUtils.encode(facesContext, root);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
}
// XXX can be removed?
Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Thu Jul 29 12:25:26 2010
@@ -25,7 +25,7 @@ import org.apache.myfaces.tobago.layout.
import org.apache.myfaces.tobago.renderkit.BoxRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -77,7 +77,7 @@ without shadow
UIBox box = (UIBox) component;
String clientId = box.getClientId(facesContext);
- writer.startElement(HtmlConstants.DIV, box);
+ writer.startElement(HtmlElements.DIV, box);
HtmlRendererUtils.renderDojoDndItem(box, writer, true);
writer.writeClassAttribute(Classes.create(box));
writer.writeIdAttribute(clientId);
@@ -95,7 +95,7 @@ without shadow
if (hasShadow) {
// shadow begin
- writer.startElement(HtmlConstants.DIV, box);
+ writer.startElement(HtmlElements.DIV, box);
writer.writeClassAttribute(Classes.create(box, "shadow"));
Style shadow = new Style();
@@ -104,7 +104,7 @@ without shadow
writer.writeStyleAttribute(shadow);
// border begin
- writer.startElement(HtmlConstants.DIV, box);
+ writer.startElement(HtmlElements.DIV, box);
writer.writeClassAttribute(Classes.create(box, "border"));
Style border = new Style();
@@ -114,7 +114,7 @@ without shadow
}
UIComponent label = box.getFacet(Facets.LABEL);
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "header"));
String labelString = (String) box.getAttributes().get(Attributes.LABEL);
if (label != null) {
@@ -122,7 +122,7 @@ without shadow
} else if (labelString != null) {
writer.writeText(labelString);
}
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
UIPanel toolbar = (UIPanel) box.getFacet(Facets.TOOL_BAR);
if (toolbar != null) {
@@ -131,12 +131,12 @@ without shadow
if (hasShadow) {
// border end
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
// shadow end
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
}
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "content")); // needed to be scrollable inside of the box
final Style style = new Style(facesContext, box);
final Measure offsetLeft = getOffsetLeft(facesContext, box);
@@ -153,16 +153,16 @@ without shadow
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.endElement(HtmlConstants.DIV);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
+ writer.endElement(HtmlElements.DIV);
}
protected void renderToolbar(
FacesContext facesContext, TobagoResponseWriter writer, UIBox box, UIPanel toolbar) throws IOException {
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "headerToolbar"));
toolbar.setRendererType(RendererTypes.BOX_TOOL_BAR);
RenderUtils.encode(facesContext, toolbar);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java Thu Jul 29 12:25:26 2010
@@ -21,7 +21,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Overflow;
import org.apache.myfaces.tobago.renderkit.css.Style;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -36,7 +36,7 @@ public class TabGroupRenderer
TobagoResponseWriter writer, FacesContext facesContext, UITab activeTab, Style body)
throws IOException {
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(activeTab, "shadow"));
if (body != null) {
Style body1 = new Style(body);
@@ -47,7 +47,7 @@ public class TabGroupRenderer
writer.writeStyleAttribute(body1);
}
- writer.startElement(HtmlConstants.DIV, null);
+ writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(activeTab, "content"));
if (body != null) {
@@ -62,7 +62,7 @@ public class TabGroupRenderer
writer.flush();
RenderUtils.encodeChildren(facesContext, activeTab);
- writer.endElement(HtmlConstants.DIV);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
+ writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java Thu Jul 29 12:25:26 2010
@@ -17,12 +17,12 @@ package org.apache.myfaces.tobago.render
* limitations under the License.
*/
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.component.UIMediator;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Style;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -39,7 +39,7 @@ public class MediatorRenderer extends La
UIMediator mediator = (UIMediator) component;
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlConstants.DIV, mediator);
+ writer.startElement(HtmlElements.DIV, mediator);
writer.writeStyleAttribute(new Style(facesContext, mediator));
}
@@ -47,6 +47,6 @@ public class MediatorRenderer extends La
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.endElement(HtmlConstants.DIV);
+ writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java Thu Jul 29 12:25:26 2010
@@ -29,7 +29,7 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.VariableResolverUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -52,7 +52,7 @@ public class SeparatorRenderer extends L
label = StringUtils.replace(label, " ", HtmlUtils.CHAR_NON_BEAKING_SPACE);
}
- writer.startElement(HtmlConstants.TABLE, component);
+ writer.startElement(HtmlElements.TABLE, component);
writer.writeIdAttribute(separator.getClientId(facesContext));
writer.writeClassAttribute(Classes.create(component));
Style style = new Style(facesContext, separator);
@@ -60,34 +60,34 @@ public class SeparatorRenderer extends L
writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", false);
writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", false);
- writer.startElement(HtmlConstants.TR, component);
+ writer.startElement(HtmlElements.TR, component);
- writer.startElement(HtmlConstants.TD, component);
+ writer.startElement(HtmlElements.TD, component);
writer.writeClassAttribute(Classes.create(component, "start"));
- writer.startElement(HtmlConstants.HR , component);
- writer.endElement(HtmlConstants.HR);
- writer.endElement(HtmlConstants.TD);
+ writer.startElement(HtmlElements.HR , component);
+ writer.endElement(HtmlElements.HR);
+ writer.endElement(HtmlElements.TD);
- writer.startElement(HtmlConstants.TD, component);
+ writer.startElement(HtmlElements.TD, component);
writer.writeClassAttribute(Classes.create(component, "label"));
writer.writeText(label);
- writer.endElement(HtmlConstants.TD);
+ writer.endElement(HtmlElements.TD);
- writer.startElement(HtmlConstants.TD, component);
+ writer.startElement(HtmlElements.TD, component);
writer.writeClassAttribute(Classes.create(component, "end"));
- writer.startElement(HtmlConstants.HR , component);
- writer.endElement(HtmlConstants.HR);
- writer.endElement(HtmlConstants.TD);
+ writer.startElement(HtmlElements.HR , component);
+ writer.endElement(HtmlElements.HR);
+ writer.endElement(HtmlElements.TD);
- writer.endElement(HtmlConstants.TR);
- writer.endElement(HtmlConstants.TABLE);
+ writer.endElement(HtmlElements.TR);
+ writer.endElement(HtmlElements.TABLE);
} else {
- writer.startElement(HtmlConstants.HR , component);
+ writer.startElement(HtmlElements.HR , component);
writer.writeIdAttribute(separator.getClientId(facesContext));
writer.writeClassAttribute(Classes.create(component));
Style style = new Style(facesContext, separator);
writer.writeStyleAttribute(style);
- writer.endElement(HtmlConstants.HR);
+ writer.endElement(HtmlElements.HR);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=980422&r1=980421&r2=980422&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Thu Jul 29 12:25:26 2010
@@ -33,7 +33,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
+import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -129,9 +129,9 @@ public final class HtmlRendererUtils {
writer.writeText(text);
} else {
writer.writeText(text.substring(0, pos));
- writer.startElement(HtmlConstants.U, null);
+ writer.startElement(HtmlElements.U, null);
writer.writeText(Character.toString(text.charAt(pos)));
- writer.endElement(HtmlConstants.U);
+ writer.endElement(HtmlElements.U);
writer.writeText(text.substring(pos + 1));
}
}
@@ -363,16 +363,16 @@ public final class HtmlRendererUtils {
}
for (SelectItem item : items) {
if (item instanceof SelectItemGroup) {
- writer.startElement(HtmlConstants.OPTGROUP, null);
+ writer.startElement(HtmlElements.OPTGROUP, null);
writer.writeAttribute(HtmlAttributes.LABEL, item.getLabel(), true);
if (item.isDisabled()) {
writer.writeAttribute(HtmlAttributes.DISABLED, true);
}
SelectItem[] selectItems = ((SelectItemGroup) item).getSelectItems();
renderSelectItems(component, Arrays.asList(selectItems), values, writer, facesContext);
- writer.endElement(HtmlConstants.OPTGROUP);
+ writer.endElement(HtmlElements.OPTGROUP);
} else {
- writer.startElement(HtmlConstants.OPTION, null);
+ writer.startElement(HtmlElements.OPTION, null);
Object itemValue = item.getValue();
// when using selectItem tag with a literal value: use the converted value
if (itemValue instanceof String && values != null && values.length > 0 && !(values[0] instanceof String)) {
@@ -399,7 +399,7 @@ public final class HtmlRendererUtils {
writer.writeClassAttribute(Classes.create(component, "option", markup));
writer.writeText(item.getLabel());
- writer.endElement(HtmlConstants.OPTION);
+ writer.endElement(HtmlElements.OPTION);
}
}
}
@@ -692,10 +692,10 @@ public final class HtmlRendererUtils {
throws IOException {
final UIComponent contextMenu = FacetUtils.getContextMenu(parent);
if (contextMenu != null) {
- writer.startElement(HtmlConstants.OL, contextMenu);
+ writer.startElement(HtmlElements.OL, contextMenu);
writer.writeClassAttribute("tobago-menuBar tobago-menu-contextMenu");
RenderUtils.encode(facesContext, contextMenu);
- writer.endElement(HtmlConstants.OL);
+ writer.endElement(HtmlElements.OL);
}
}