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 2009/10/30 18:26:33 UTC
svn commit: r831397 [2/2] - in /myfaces/tobago/trunk:
example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/
extension/deprecation/src/main/java/org/apache/myfaces/tobago/renderkit/
extension/deprecati...
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -32,7 +32,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.AccessKeyMap;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -52,7 +52,7 @@
String clientId = command.getClientId(facesContext);
CommandRendererHelper helper = new CommandRendererHelper(facesContext, command, CommandRendererHelper.Tag.ANCHOR);
String href = helper.getHref();
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
LabelWithAccessKey label = new LabelWithAccessKey(command);
@@ -76,11 +76,11 @@
}
}
writer.writeStyleAttribute();
- HtmlRendererUtil.renderDojoDndItem(component, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeClassAttribute();
writer.writeIdAttribute(clientId);
writer.writeNameAttribute(clientId);
- HtmlRendererUtil.renderTip(command, writer);
+ HtmlRendererUtils.renderTip(command, writer);
writer.flush();
// image
@@ -94,8 +94,8 @@
writer.startElement(HtmlConstants.IMG, command);
writer.writeAttribute(HtmlAttributes.SRC, image, true);
writer.writeAttribute(HtmlAttributes.BORDER, 0); // TODO: is border=0 setting via style possible?
- HtmlRendererUtil.renderImageTip(command, writer);
- HtmlRendererUtil.renderTip(command, writer);
+ HtmlRendererUtils.renderImageTip(command, writer);
+ HtmlRendererUtils.renderTip(command, writer);
writer.endElement(HtmlConstants.IMG);
}
@@ -104,7 +104,7 @@
if (image != null) {
writer.write(" "); // separator: e.g.
}
- HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
+ HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
}
if (label.getAccessKey() != null) {
@@ -113,7 +113,7 @@
LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- HtmlRendererUtil.addClickAcceleratorKey(facesContext, clientId, label.getAccessKey());
+ HtmlRendererUtils.addClickAcceleratorKey(facesContext, clientId, label.getAccessKey());
}
}
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -44,7 +44,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.AccessKeyMap;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -81,11 +81,11 @@
clientId = component.getParent().getClientId(facesContext);
} else {
clientId = component.getClientId(facesContext);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, component);
writer.writeIdAttribute(clientId);
- HtmlRendererUtil.renderDojoDndItem(component, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(component, writer, true);
StyleClasses styleClasses = StyleClasses.ensureStyleClasses(component);
if (ComponentUtils.getBooleanAttribute(component, Attributes.PAGE_MENU)) {
styleClasses.addClass("menuBar", "page-facet"); // XXX not a standard compliant name
@@ -113,7 +113,7 @@
List<String> accKeyFunctions
= (List<String>) attributes.remove(MENU_ACCELERATOR_KEYS);
if (!accKeyFunctions.isEmpty()) {
- HtmlRendererUtil.writeScriptLoader(facesContext, null,
+ HtmlRendererUtils.writeScriptLoader(facesContext, null,
accKeyFunctions.toArray(new String[accKeyFunctions.size()]));
}
}
@@ -136,7 +136,7 @@
super.prepareRender(facesContext, component);
if (facesContext instanceof TobagoFacesContext) {
if (!ComponentUtils.getBooleanAttribute(component, Attributes.MENU_POPUP)) {
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ HtmlRendererUtils.renderDojoDndSource(facesContext, component);
}
final String[] scripts = new String[]{"script/tobago-menu.js"};
@@ -169,7 +169,7 @@
lines.add(st.nextToken());
}
lines.add(function);
- HtmlRendererUtil.writeScriptLoader(facesContext,
+ HtmlRendererUtils.writeScriptLoader(facesContext,
new String[] {"script/tobago-menu.js"},
lines.toArray(new String[lines.size()]));
}
@@ -242,7 +242,7 @@
FastStringWriter stringWriter = new FastStringWriter();
ResponseWriter newWriter = savedWriter.cloneWithWriter(stringWriter);
facesContext.setResponseWriter(newWriter);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writeMenuEntry(facesContext, writer, uiPanel);
@@ -291,7 +291,7 @@
addAcceleratorKey(facesContext, uiPanel, label.getAccessKey());
}
}
- HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
+ HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
}
writer.endElement(HtmlConstants.A);
}
@@ -305,7 +305,7 @@
if (component != null) {
List<String> keys
= (List<String>) component.getAttributes().get(MENU_ACCELERATOR_KEYS);
- String jsStatement = HtmlRendererUtil.createOnclickAcceleratorKeyJsStatement(
+ String jsStatement = HtmlRendererUtils.createOnclickAcceleratorKeyJsStatement(
clientId, accessKey, null);
keys.add(jsStatement);
} else {
@@ -480,7 +480,7 @@
FastStringWriter stringWriter = new FastStringWriter();
ResponseWriter newWriter = savedWriter.cloneWithWriter(stringWriter);
facesContext.setResponseWriter(newWriter);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
addImage(writer, facesContext, image, disabled);
writer.startElement(HtmlConstants.A, null);
@@ -502,7 +502,7 @@
writer.writeAttribute(HtmlAttributes.ONKEYDOWN, "tobagoMenuKeyDown(event)", false);
writer.writeAttribute(HtmlAttributes.ONKEYPRESS, "tobagoMenuKeyPress(event)", false);
if (label.getText() != null) {
- HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
+ HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
}
writer.endElement(HtmlConstants.A);
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -28,7 +28,7 @@
import org.apache.myfaces.tobago.renderkit.MessageRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -59,7 +59,7 @@
Iterator iterator = facesContext.getMessages(clientId);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
boolean showSummary = ComponentUtils.getBooleanAttribute(component, Attributes.SHOW_SUMMARY);
boolean showDetail = ComponentUtils.getBooleanAttribute(component, Attributes.SHOW_DETAIL);
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -44,7 +44,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -72,7 +72,7 @@
return;
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (LOG.isDebugEnabled()) {
LOG.debug("facesContext is " + facesContext.getClass().getName());
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -22,7 +22,7 @@
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -32,7 +32,7 @@
public class ObjectRenderer extends LayoutableRendererBase {
public void encodeEnd(FacesContext facesContext, UIComponent component)
throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.IFRAME, component);
writer.writeIdAttribute(component.getClientId(facesContext));
writer.writeNameAttribute(component.getClientId(facesContext));
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.tobago.component.UIOut;
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -40,7 +40,7 @@
text = "";
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
boolean escape = out.getEscape();
boolean createSpan = out.getCreateSpan();
@@ -50,9 +50,9 @@
writer.startElement(HtmlConstants.DIV, out);
writer.writeIdAttribute(id);
writer.writeStyleAttribute();
- HtmlRendererUtil.renderDojoDndItem(out, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(out, writer, true);
writer.writeClassAttribute();
- HtmlRendererUtil.renderTip(out, writer);
+ HtmlRendererUtils.renderTip(out, writer);
}
if (escape) {
StringTokenizer tokenizer = new StringTokenizer(text, "\n\r");
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -33,7 +33,7 @@
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.AccessKeyMap;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -120,7 +120,7 @@
RenderUtil.prepareRendererAll(facesContext, page);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
// reset responseWriter and render page
facesContext.setResponseWriter(writer);
@@ -141,7 +141,7 @@
formAction = facesContext.getExternalContext().encodeActionURL(formAction);
String contentType = writer.getContentTypeWithCharSet();
ResponseUtils.ensureContentTypeHeader(facesContext, contentType);
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ HtmlRendererUtils.renderDojoDndSource(facesContext, component);
String title = (String) page.getAttributes().get(Attributes.LABEL);
@@ -362,7 +362,7 @@
"script/logging.js"
};
final String[] jsCommand = new String[]{"new LOG.LogArea({hide: " + hideClientLogging + "});"};
- HtmlRendererUtil.writeScriptLoader(facesContext, jsFiles, jsCommand);
+ HtmlRendererUtils.writeScriptLoader(facesContext, jsFiles, jsCommand);
writer.writeJavascript("TbgTimer.startBody = new Date();");
}
*/
@@ -476,7 +476,7 @@
RenderUtil.encode(facesContext, popup);
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
String clientId = page.getClientId(facesContext);
final boolean debugMode = ClientProperties.getInstance(facesContext.getViewRoot()).isDebugMode();
@@ -521,7 +521,7 @@
logMessages.add("LOG.info(\"FacesContext = " + facesContext + "\");");
- HtmlRendererUtil.writeScriptLoader(facesContext, null,
+ HtmlRendererUtils.writeScriptLoader(facesContext, null,
logMessages.toArray(new String[logMessages.size()]));
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java Fri Oct 30 17:26:30 2009
@@ -32,7 +32,7 @@
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -48,7 +48,7 @@
@Override
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ HtmlRendererUtils.renderDojoDndSource(facesContext, component);
}
@Override
@@ -68,9 +68,9 @@
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
String clientId = component.getClientId(facesContext);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, component);
- HtmlRendererUtil.renderDojoDndItem(component, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeClassAttribute();
writer.writeIdAttribute(clientId);
writer.writeStyleAttribute();
@@ -89,7 +89,7 @@
"new Tobago.Panel(\"" + clientId + "\", " + true + ", " + frequency + ");"
};
- HtmlRendererUtil.writeScriptLoader(facesContext, null, cmds);
+ HtmlRendererUtils.writeScriptLoader(facesContext, null, cmds);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Fri Oct 30 17:26:30 2009
@@ -37,7 +37,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -71,7 +71,7 @@
public void encodeBegin(
FacesContext facesContext, UIComponent uiComponent) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
UIPopup component = (UIPopup) uiComponent;
final String clientId = component.getClientId(facesContext);
final String contentDivId = clientId + CONTENT_ID_POSTFIX;
@@ -155,7 +155,7 @@
public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
UIPopup component = (UIPopup) uiComponent;
final String clientId = component.getClientId(facesContext);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ProgressRenderer.java Fri Oct 30 17:26:30 2009
@@ -32,7 +32,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -81,7 +81,7 @@
width2 = Integer.toString((width - 2) - value);
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.SPAN, component);
writer.writeClassAttribute();
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/RichTextEditorRenderer.java Fri Oct 30 17:26:30 2009
@@ -37,7 +37,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -97,7 +97,7 @@
String clientId = component.getClientId(facesContext);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
StyleClasses containerClasses = StyleClasses.ensureStyleClassesCopy(component);
containerClasses.addClass("richTextEditor", "container");
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Fri Oct 30 17:26:30 2009
@@ -29,7 +29,7 @@
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -77,7 +77,7 @@
UISelectBoolean selectBoolean = (UISelectBoolean) component;
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
UIComponent label = ComponentUtils.provideLabel(facesContext, selectBoolean);
@@ -90,7 +90,7 @@
writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
- HtmlRendererUtil.renderTip(component, writer);
+ HtmlRendererUtils.renderTip(component, writer);
writer.startElement(HtmlConstants.TR, null);
writer.startElement(HtmlConstants.TD, null);
@@ -120,7 +120,7 @@
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
- String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, selectBoolean);
+ String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, selectBoolean);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
@@ -141,7 +141,7 @@
writer.endElement(HtmlConstants.TR);
writer.endElement(HtmlConstants.TABLE);
}
- HtmlRendererUtil.checkForCommandFacet(selectBoolean, facesContext, writer);
+ HtmlRendererUtils.checkForCommandFacet(selectBoolean, facesContext, writer);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyCheckboxRenderer.java Fri Oct 30 17:26:30 2009
@@ -30,7 +30,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -59,7 +59,7 @@
List<SelectItem> items = RenderUtil.getItemsToRender(selectMany);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
Object[] values = selectMany.getSelectedValues();
if (LOG.isDebugEnabled()) {
@@ -68,7 +68,7 @@
String id = selectMany.getClientId(facesContext);
boolean inline = ComponentUtils.getBooleanAttribute(selectMany, Attributes.INLINE);
- String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, selectMany);
+ String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, selectMany);
if (!inline) {
writer.startElement(HtmlConstants.TABLE, selectMany);
// TODO writer.writeComponentClass();
@@ -158,7 +158,7 @@
if (!inline) {
writer.endElement(HtmlConstants.TABLE);
}
- HtmlRendererUtil.renderFocusId(facesContext, selectMany);
- HtmlRendererUtil.checkForCommandFacet(selectMany, clientIds, facesContext, writer);
+ HtmlRendererUtils.renderFocusId(facesContext, selectMany);
+ HtmlRendererUtils.checkForCommandFacet(selectMany, clientIds, facesContext, writer);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectManyListboxRenderer.java Fri Oct 30 17:26:30 2009
@@ -29,7 +29,7 @@
import org.apache.myfaces.tobago.renderkit.SelectManyRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -64,8 +64,8 @@
LOG.debug("items.size() = '" + items.size() + "'");
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
- String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, selectMany);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, selectMany);
writer.startElement(HtmlConstants.SELECT, selectMany);
String clientId = selectMany.getClientId(facesContext);
writer.writeNameAttribute(clientId);
@@ -87,11 +87,11 @@
if (LOG.isDebugEnabled()) {
LOG.debug("values = '" + Arrays.toString(values) + "'");
}
- HtmlRendererUtil.renderSelectItems(selectMany, items, values, writer, facesContext);
+ HtmlRendererUtils.renderSelectItems(selectMany, items, values, writer, facesContext);
writer.endElement(HtmlConstants.SELECT);
- HtmlRendererUtil.checkForCommandFacet(selectMany, facesContext, writer);
- HtmlRendererUtil.renderFocusId(facesContext, selectMany);
+ HtmlRendererUtils.checkForCommandFacet(selectMany, facesContext, writer);
+ HtmlRendererUtils.renderFocusId(facesContext, selectMany);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java Fri Oct 30 17:26:30 2009
@@ -26,7 +26,7 @@
import org.apache.myfaces.tobago.renderkit.SelectOneRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -52,7 +52,7 @@
return;
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
UISelectOneChoice selectOne = (UISelectOneChoice) component;
List<SelectItem> items = RenderUtil.getSelectItems(selectOne);
@@ -60,7 +60,7 @@
LOG.debug("items.size() = '" + items.size() + "'");
}
- String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, selectOne);
+ String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, selectOne);
boolean disabled = items.size() == 0
|| ComponentUtils.getBooleanAttribute(selectOne, Attributes.DISABLED)
@@ -92,11 +92,11 @@
}
Object[] values = {selectOne.getValue()};
- HtmlRendererUtil.renderSelectItems(selectOne, items, values, writer, facesContext);
+ HtmlRendererUtils.renderSelectItems(selectOne, items, values, writer, facesContext);
writer.endElement(HtmlConstants.SELECT);
super.encodeEnd(facesContext, selectOne);
- HtmlRendererUtil.renderFocusId(facesContext, selectOne);
- HtmlRendererUtil.checkForCommandFacet(selectOne, facesContext, writer);
+ HtmlRendererUtils.renderFocusId(facesContext, selectOne);
+ HtmlRendererUtils.checkForCommandFacet(selectOne, facesContext, writer);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java Fri Oct 30 17:26:30 2009
@@ -29,7 +29,7 @@
import org.apache.myfaces.tobago.renderkit.SelectOneRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -55,7 +55,7 @@
return;
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
UISelectOneListbox selectOne = (UISelectOneListbox) component;
List<SelectItem> items = RenderUtil.getSelectItems(selectOne);
@@ -71,7 +71,7 @@
}
writer.writeStyleAttribute();
writer.writeClassAttribute();
- HtmlRendererUtil.renderTip(selectOne, writer);
+ HtmlRendererUtils.renderTip(selectOne, writer);
writer.writeAttribute(HtmlAttributes.SIZE, 2); // should be greater 1
if (!ComponentUtils.getBooleanAttribute(selectOne, Attributes.REQUIRED)) {
writer.writeAttribute(HtmlAttributes.ONCHANGE, "Tobago.selectOneListboxChange(this)", false);
@@ -80,12 +80,12 @@
Object[] values = {selectOne.getValue()};
- HtmlRendererUtil.renderSelectItems(selectOne, items, values, writer, facesContext);
+ HtmlRendererUtils.renderSelectItems(selectOne, items, values, writer, facesContext);
writer.endElement(HtmlConstants.SELECT);
super.encodeEnd(facesContext, selectOne);
- HtmlRendererUtil.renderFocusId(facesContext, selectOne);
- HtmlRendererUtil.checkForCommandFacet(selectOne, facesContext, writer);
+ HtmlRendererUtils.renderFocusId(facesContext, selectOne);
+ HtmlRendererUtils.checkForCommandFacet(selectOne, facesContext, writer);
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneRadioRenderer.java Fri Oct 30 17:26:30 2009
@@ -31,7 +31,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -84,8 +84,8 @@
List<SelectItem> items = RenderUtil.getItemsToRender(selectOne);
boolean inline = ComponentUtils.getBooleanAttribute(selectOne, Attributes.INLINE);
- String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, selectOne);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, selectOne);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (!inline) {
writer.startElement(HtmlConstants.TABLE, selectOne);
@@ -134,7 +134,7 @@
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
- HtmlRendererUtil.renderTip(selectOne, writer);
+ HtmlRendererUtils.renderTip(selectOne, writer);
if (!ComponentUtils.getBooleanAttribute(selectOne, Attributes.REQUIRED) || readonly) {
writer.writeAttribute(HtmlAttributes.ONCLICK,
"Tobago.selectOneRadioClick(this, '" + clientId + "',"
@@ -185,8 +185,8 @@
if (!inline) {
writer.endElement(HtmlConstants.TABLE);
}
- HtmlRendererUtil.renderFocusId(facesContext, selectOne);
- HtmlRendererUtil.checkForCommandFacet(selectOne, clientIds, facesContext, writer);
+ HtmlRendererUtils.renderFocusId(facesContext, selectOne);
+ HtmlRendererUtils.checkForCommandFacet(selectOne, clientIds, facesContext, writer);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Fri Oct 30 17:26:30 2009
@@ -58,7 +58,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.LayoutInfo;
@@ -107,13 +107,13 @@
final String sheetId = data.getClientId(facesContext);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
// Outer sheet div
writer.startElement(HtmlConstants.DIV, data);
writer.writeIdAttribute(sheetId + "_outer_div");
writer.writeClassAttribute("tobago-sheet-outer-div");
-// todo HtmlStyleMap style = HtmlRendererUtil.createStyle(data);
+// todo HtmlStyleMap style = HtmlRendererUtils.createStyle(data);
writer.writeStyleAttribute();
UICommand clickAction = null;
UICommand dblClickAction = null;
@@ -162,18 +162,18 @@
"new Tobago.Sheet(\"" + sheetId + "\", " + ajaxEnabled
+ ", \"" + checked + "\", \"" + unchecked + "\", \"" + data.getSelectable()
+ "\", " + columnSelectorIndex + ", "+ frequency
- + ", " + (clickAction!=null?HtmlRendererUtil.getJavascriptString(clickAction.getId()):null)
- + ", " + HtmlRendererUtil.getRenderedPartiallyJavascriptArray(facesContext, clickAction)
- + ", " + (dblClickAction!=null?HtmlRendererUtil.getJavascriptString(dblClickAction.getId()):null)
- + ", " + HtmlRendererUtil.getRenderedPartiallyJavascriptArray(facesContext, dblClickAction)
+ + ", " + (clickAction!=null? HtmlRendererUtils.getJavascriptString(clickAction.getId()):null)
+ + ", " + HtmlRendererUtils.getRenderedPartiallyJavascriptArray(facesContext, clickAction)
+ + ", " + (dblClickAction!=null? HtmlRendererUtils.getJavascriptString(dblClickAction.getId()):null)
+ + ", " + HtmlRendererUtils.getRenderedPartiallyJavascriptArray(facesContext, dblClickAction)
+ ");"
};
- HtmlRendererUtil.writeScriptLoader(facesContext, SCRIPTS, cmds);
+ HtmlRendererUtils.writeScriptLoader(facesContext, SCRIPTS, cmds);
}
private void renderSheet(FacesContext facesContext, UIData data, boolean hasClickAction) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
ResourceManager resourceManager = ResourceManagerFactory.getResourceManager(facesContext);
UIViewRoot viewRoot = facesContext.getViewRoot();
String contextPath = facesContext.getExternalContext().getRequestContextPath();
@@ -183,7 +183,7 @@
String selectorDisabled = contextPath + resourceManager.getImage(viewRoot, "image/sheetUncheckedDisabled.gif");
String unchecked = contextPath + resourceManager.getImage(viewRoot, "image/sheetUnchecked.gif");
- HtmlStyleMap style = HtmlRendererUtil.ensureStyleAttributeMap(data);
+ HtmlStyleMap style = HtmlRendererUtils.ensureStyleAttributeMap(data);
//HtmlStyleMap headerStyle = (HtmlStyleMap) attributes.get(STYLE_HEADER);
// String sheetWidthString = LayoutUtils.getStyleAttributeValue(style,
// "width");
@@ -374,13 +374,13 @@
writer.writeClassAttribute(tdClass.toString());
final String align = (String) column.getAttributes().get(Attributes.ALIGN);
if (align != null) {
- writer.writeStyleAttribute(HtmlRendererUtil.toStyleString("text-align", align));
+ writer.writeStyleAttribute(HtmlRendererUtils.toStyleString("text-align", align));
}
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(
sheetId + "_data_row_" + visibleIndex + "_column" + columnIndex);
writer.writeClassAttribute("tobago-sheet-cell-outer");
- writer.writeStyleAttribute(HtmlRendererUtil.toStyleString("width", columnWidths.get(columnIndex)));
+ writer.writeStyleAttribute(HtmlRendererUtils.toStyleString("width", columnWidths.get(columnIndex)));
writer.startElement(HtmlConstants.DIV, null);
writer.writeClassAttribute("tobago-sheet-cell-inner");
@@ -642,7 +642,7 @@
}
}
- HtmlStyleMap style = HtmlRendererUtil.ensureStyleAttributeMap(data);
+ HtmlStyleMap style = HtmlRendererUtils.ensureStyleAttributeMap(data);
if (style.getHeight() != null) {
int first = data.getFirst();
int rows = Math.min(data.getRowCount(), first + data.getRows()) - first;
@@ -741,7 +741,7 @@
String image = ResourceManagerUtil.getImageWithPath(facesContext,
"image/sheet" + command.getToken() + (disabled ? "Disabled" : "") + ".gif");
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.IMG, null);
writer.writeIdAttribute(data.getClientId(facesContext)
+ SUBCOMPONENT_SEP + "pagingPages" + SUBCOMPONENT_SEP + command.getToken());
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Fri Oct 30 17:26:30 2009
@@ -50,7 +50,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.AccessKeyMap;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -113,10 +113,10 @@
final String switchType = tabGroup.getSwitchType();
if (TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
- HtmlRendererUtil.writeScriptLoader(facesContext, SCRIPTS, new String[0]);
+ HtmlRendererUtils.writeScriptLoader(facesContext, SCRIPTS, new String[0]);
}
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.INPUT, null);
writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
writer.writeAttribute(HtmlAttributes.VALUE, Integer.toString(activeIndex), false);
@@ -152,7 +152,7 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(clientId);
- HtmlRendererUtil.renderDojoDndItem(tabGroup, writer, false);
+ HtmlRendererUtils.renderDojoDndItem(tabGroup, writer, false);
//TODO writer.writeClassAttribute("dojoDndItem");
StyleClasses classes = (StyleClasses) tabGroup.getAttributes().get(Attributes.STYLE_CLASS);
writer.writeClassAttribute(classes);
@@ -168,7 +168,7 @@
" '" + activeIndex + "', ",
" '" + tabGroup.getChildCount() + "');"
};
- HtmlRendererUtil.writeScriptLoader(facesContext, new String[0], cmds);
+ HtmlRendererUtils.writeScriptLoader(facesContext, new String[0], cmds);
}
}
}
@@ -394,7 +394,7 @@
writer.writeStyleAttribute(labelStyle);
writer.writeIdAttribute(tab.getClientId(facesContext));
- HtmlRendererUtil.renderTip(tab, writer);
+ HtmlRendererUtils.renderTip(tab, writer);
writer.startElement(HtmlConstants.DIV, tab);
writer.writeStyleAttribute(labelStyle);
@@ -418,7 +418,7 @@
}
}
if (label.getText() != null) {
- HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
+ HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
} else {
writer.writeText(Integer.toString(index + 1));
}
@@ -429,7 +429,7 @@
&& !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
LOG.warn("dublicated accessKey : " + label.getAccessKey());
}
- HtmlRendererUtil.addClickAcceleratorKey(facesContext, tabId, label.getAccessKey());
+ HtmlRendererUtils.addClickAcceleratorKey(facesContext, tabId, label.getAccessKey());
}
writer.endElement(HtmlConstants.DIV);
writer.endElement(HtmlConstants.DIV);
@@ -531,7 +531,7 @@
TabList tabList = getTabList(context, (UITabGroup) component);
int index = ensureRenderedActiveIndex(context, (UITabGroup) component);
Measure currentWidth = new PixelMeasure(getCurrentWidth(tabList, index));
- renderTabGroupView(context, HtmlRendererUtil.getTobagoResponseWriter(context),
+ renderTabGroupView(context, HtmlRendererUtils.getTobagoResponseWriter(context),
(UITabGroup) component, index, SWITCH_TYPE_RELOAD_TAB,
ResourceManagerUtil.getImageWithPath(context, "image/1x1.gif"),
ThemeConfig.getMeasure(context, component, "navigationBarWidth"), currentWidth, tabList);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java Fri Oct 30 17:26:30 2009
@@ -31,7 +31,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -54,12 +54,12 @@
}
UITextarea input = (UITextarea) component;
- String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, component);
+ String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, component);
String clientId = input.getClientId(facesContext);
String onchange = HtmlUtils.generateOnchange(input, facesContext);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.TEXTAREA, input);
writer.writeNameAttribute(clientId);
writer.writeIdAttribute(clientId);
@@ -75,7 +75,7 @@
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
- HtmlRendererUtil.renderDojoDndItem(component, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(component, writer, true);
writer.writeStyleAttribute();
writer.writeClassAttribute();
@@ -96,7 +96,7 @@
}
writer.endElement(HtmlConstants.TEXTAREA);
- HtmlRendererUtil.checkForCommandFacet(input, facesContext, writer);
+ HtmlRendererUtils.checkForCommandFacet(input, facesContext, writer);
int maxLength = -1;
for (Validator validator : input.getValidators()) {
if (validator instanceof LengthValidator) {
@@ -106,16 +106,16 @@
}
boolean required = ComponentUtils.getBooleanAttribute(input, Attributes.REQUIRED);
if (required || maxLength > 0) {
- String rendererName = HtmlRendererUtil.getRendererName(facesContext, input);
+ String rendererName = HtmlRendererUtils.getRendererName(facesContext, input);
final String[] cmds = {
"new Tobago.In(\"" + input.getClientId(facesContext) + "\", true ,\""
+ StyleClasses.PREFIX + rendererName + "\" " + (maxLength > -1? "," + maxLength: "") + " );"
};
- HtmlRendererUtil.writeScriptLoader(facesContext, null, cmds);
+ HtmlRendererUtils.writeScriptLoader(facesContext, null, cmds);
}
// focus
- HtmlRendererUtil.renderFocusId(facesContext, input);
+ HtmlRendererUtils.renderFocusId(facesContext, input);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TimeRenderer.java Fri Oct 30 17:26:30 2009
@@ -33,7 +33,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.DateFormatUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -72,7 +72,7 @@
UITime input = (UITime) component;
- String title = HtmlRendererUtil.getTitleFromTipAndMessages(facesContext, input);
+ String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, input);
String currentValue = getCurrentValue(facesContext, input);
if (LOG.isDebugEnabled()) {
LOG.debug("currentValue = '" + currentValue + "'");
@@ -108,7 +108,7 @@
String id = input.getClientId(facesContext);
final String idPrefix = id + SUBCOMPONENT_SEP;
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, input);
writer.writeClassAttribute();
writer.writeStyleAttribute();
@@ -131,7 +131,7 @@
String imageId = idPrefix + "inc";
String imageSrc = "image/timeIncrement.gif";
- HtmlRendererUtil.addImageSources(facesContext, writer, imageSrc, imageId);
+ HtmlRendererUtils.addImageSources(facesContext, writer, imageSrc, imageId);
writer.startElement(HtmlConstants.IMG, null);
writer.writeIdAttribute(imageId);
writer.writeClassAttribute("tobago-time-inc-image"
@@ -151,7 +151,7 @@
imageId = idPrefix + "dec";
imageSrc = "image/timeDecrement.gif";
- HtmlRendererUtil.addImageSources(facesContext, writer, imageSrc, imageId);
+ HtmlRendererUtils.addImageSources(facesContext, writer, imageSrc, imageId);
writer.startElement(HtmlConstants.IMG, null);
writer.writeIdAttribute(imageId);
writer.writeClassAttribute("tobago-time-dec-image"
@@ -185,7 +185,7 @@
if (dateTextBoxId != null) {
String[] cmds = {"tbgInitTimeParse('" + id + "', '" + dateTextBoxId + "');"};
- HtmlRendererUtil.writeScriptLoader(facesContext, SCRIPTS, cmds);
+ HtmlRendererUtils.writeScriptLoader(facesContext, SCRIPTS, cmds);
}
writer.endElement(HtmlConstants.DIV);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java Fri Oct 30 17:26:30 2009
@@ -26,7 +26,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.component.UIToolBar;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -41,11 +41,11 @@
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
UIPanel toolbar = (UIPanel) uiComponent;
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, toolbar);
writer.writeIdAttribute(toolbar.getClientId(facesContext));
- HtmlRendererUtil.renderDojoDndItem(toolbar, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(toolbar, writer, true);
writer.writeClassAttribute();
writer.writeStyleAttribute();
writer.startElement(HtmlConstants.DIV, toolbar);
Modified: myfaces/tobago/trunk/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/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRendererBase.java Fri Oct 30 17:26:30 2009
@@ -38,7 +38,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.AccessKeyMap;
import org.apache.myfaces.tobago.util.ComponentUtils;
@@ -61,7 +61,7 @@
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ HtmlRendererUtils.renderDojoDndSource(facesContext, component);
}
protected String getLabelPosition(UIComponent component) {
@@ -75,7 +75,7 @@
public void encodeEnd(FacesContext context, UIComponent uiComponent) throws IOException {
UIPanel toolbar = (UIPanel) uiComponent;
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(context);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(context);
List children = toolbar.getChildren();
boolean first = true;
@@ -252,12 +252,12 @@
boolean anchorOnLabel = label.getText() != null && !UIToolBar.LABEL_OFF.equals(labelPosition);
if (!UIToolBar.ICON_OFF.equals(iconSize)) {
- HtmlRendererUtil.addImageSources(facesContext, writer,
+ HtmlRendererUtils.addImageSources(facesContext, writer,
iconName != null ? iconName : "image/1x1.gif", graphicId);
writer.startElement(HtmlConstants.TD, command);
writer.writeAttribute(HtmlAttributes.ALIGN, "center", false);
- HtmlRendererUtil.renderTip(command, writer);
+ HtmlRendererUtils.renderTip(command, writer);
boolean render1pxImage = (iconName == null
&& (!UIToolBar.LABEL_BOTTOM.equals(labelPosition)
@@ -280,7 +280,7 @@
writer.writeIdAttribute(graphicId);
writer.writeAttribute(HtmlAttributes.SRC, image, false);
writer.writeAttribute(HtmlAttributes.ALT, "", false);
- HtmlRendererUtil.renderTip(command, writer);
+ HtmlRendererUtils.renderTip(command, writer);
writer.writeAttribute(HtmlAttributes.BORDER, 0);
writer.writeClassAttribute(className);
if (render1pxImage) {
@@ -315,7 +315,7 @@
}
if (label.getText() != null) {
renderAnchorBegin(facesContext, writer, command, label, disabled);
- HtmlRendererUtil.writeLabelWithAccessKey(writer, label);
+ HtmlRendererUtils.writeLabelWithAccessKey(writer, label);
writer.endElement(HtmlConstants.A);
}
writer.endElement(HtmlConstants.TD);
@@ -417,7 +417,7 @@
writer.startElement(HtmlConstants.A, command);
// TODO use StyleClasses
writer.writeClassAttribute(getAnchorClass(disabled));
- HtmlRendererUtil.renderTip(command, writer);
+ HtmlRendererUtils.renderTip(command, writer);
if (!disabled) {
writer.writeAttribute(HtmlAttributes.HREF, "#", false);
writer.writeAttribute(HtmlAttributes.ONFOCUS, "Tobago.toolbarFocus(this, event)", false);
@@ -428,7 +428,7 @@
&& !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- HtmlRendererUtil.addClickAcceleratorKey(
+ HtmlRendererUtils.addClickAcceleratorKey(
facesContext, id, label.getAccessKey());
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Fri Oct 30 17:26:30 2009
@@ -35,7 +35,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.renderkit.html.util.CommandRendererHelper;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -156,7 +156,7 @@
}
CommandRendererHelper helper = new CommandRendererHelper(facesContext, node, CommandRendererHelper.Tag.ANCHOR);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (showRoot || depth != 0) {
writer.startElement(HtmlConstants.DIV, null);
@@ -164,7 +164,7 @@
// div id
writer.writeIdAttribute(id);
if (!folder) {
- HtmlRendererUtil.renderDojoDndItem(node, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(node, writer, true);
}
// div class (css)
@@ -180,7 +180,7 @@
writer.writeClassAttribute(styleClasses);
// div style (width)
- HtmlStyleMap style = HtmlRendererUtil.ensureStyleAttributeMap(tree);
+ HtmlStyleMap style = HtmlRendererUtils.ensureStyleAttributeMap(tree);
String widthString;
if (style != null && style.getWidth() != null) {
widthString = "width: " + Integer.toString(style.getWidth().getPixel() - 22); // fixme: 4 + 18 for scrollbar
@@ -398,7 +398,7 @@
boolean folder = node.isFolder();
String id = node.getClientId(facesContext);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
if (folder) {
writer.endElement(HtmlConstants.DIV);
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?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -27,7 +27,7 @@
import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.util.FastStringWriter;
@@ -85,7 +85,7 @@
String clientId = tree.getClientId(facesContext);
UIComponent root = tree.getRoot();
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlConstants.DIV, tree);
writer.writeClassAttribute();
@@ -114,7 +114,7 @@
writer.endElement(HtmlConstants.INPUT);
}
- HtmlRendererUtil.writeScriptLoader(facesContext, SCRIPT);
+ HtmlRendererUtils.writeScriptLoader(facesContext, SCRIPT);
RenderUtil.encode(facesContext, root);
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- 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 Fri Oct 30 17:26:30 2009
@@ -35,7 +35,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -54,7 +54,7 @@
@Override
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ HtmlRendererUtils.renderDojoDndSource(facesContext, component);
}
/*
@@ -75,12 +75,12 @@
@Override
public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
UIBox box = (UIBox) component;
String clientId = box.getClientId(facesContext);
writer.startElement(HtmlConstants.DIV, box);
- HtmlRendererUtil.renderDojoDndItem(box, writer, true);
+ HtmlRendererUtils.renderDojoDndItem(box, writer, true);
writer.writeClassAttribute();
writer.writeIdAttribute(clientId);
writer.writeStyleAttribute();
@@ -161,7 +161,7 @@
@Override
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.endElement(HtmlConstants.DIV);
}
@@ -181,7 +181,7 @@
public void encodeAjax(FacesContext facesContext, UIComponent component) throws IOException {
AjaxUtils.checkParamValidity(facesContext, component, UIPanel.class);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
encodeBox(facesContext, writer, (UIBox) component);
component.encodeChildren(facesContext);
Modified: myfaces/tobago/trunk/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/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java Fri Oct 30 17:26:30 2009
@@ -26,7 +26,7 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.util.Deprecation;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
@@ -39,7 +39,7 @@
public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
UISeparator separator = (UISeparator) component;
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
String label = separator.getLabel();
if (label == null && separator.getFacet(Facets.LABEL) != null) {
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java Fri Oct 30 17:26:30 2009
@@ -105,10 +105,10 @@
+ Arrays.toString(componentIds));
}
onclick = "Tobago.openPopupWithAction(this, '"
- + HtmlRendererUtil.getComponentId(facesContext, command, componentIds[0]) + "', '" + clientId + "')";
+ + HtmlRendererUtils.getComponentId(facesContext, command, componentIds[0]) + "', '" + clientId + "')";
} else {
onclick = "Tobago.reloadComponent(this, '"
- + HtmlRendererUtil.getComponentIds(facesContext, command, componentIds) + "','" + clientId + "', {});";
+ + HtmlRendererUtils.getComponentIds(facesContext, command, componentIds) + "','" + clientId + "', {});";
}
} else if (defaultCommand) {
Copied: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (from r831383, myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?p2=myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java&p1=myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java&r1=831383&r2=831397&rev=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Fri Oct 30 17:26:30 2009
@@ -59,12 +59,12 @@
* Date: Jan 11, 2005
* Time: 4:59:36 PM
*/
-public final class HtmlRendererUtil {
+public final class HtmlRendererUtils {
- private static final Log LOG = LogFactory.getLog(HtmlRendererUtil.class);
- private static final String ERROR_FOCUS_KEY = HtmlRendererUtil.class.getName() + ".ErrorFocusId";
+ private static final Log LOG = LogFactory.getLog(HtmlRendererUtils.class);
+ private static final String ERROR_FOCUS_KEY = HtmlRendererUtils.class.getName() + ".ErrorFocusId";
- private HtmlRendererUtil() {
+ private HtmlRendererUtils() {
// to prevent instantiation
}
@@ -72,7 +72,7 @@
if (ComponentUtils.isError(input)) {
if (!FacesContext.getCurrentInstance().getExternalContext().getRequestMap().containsKey(ERROR_FOCUS_KEY)) {
FacesContext.getCurrentInstance().getExternalContext().getRequestMap().put(ERROR_FOCUS_KEY, Boolean.TRUE);
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
String id = input.getClientId(facesContext);
writer.writeJavascript("Tobago.errorFocusId = '" + id + "';");
return true;
@@ -102,7 +102,7 @@
LOG.warn("page focusId = \"" + page.getFocusId() + "\" ignoring new value \""
+ id + "\"");
} else {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.writeJavascript("Tobago.focusId = '" + id + "';");
}
}
@@ -198,41 +198,6 @@
return buffer.toString();
}
- /**
- * @deprecated Please use setter;
- */
- @Deprecated
- public static void replaceStyleAttribute(UIComponent component, String styleAttribute, String value) {
- Deprecation.LOG.error("HtmlRendererUtil.replaceStyleAttribute() no longer supported. Use setter.");
- }
-
- /**
- * @deprecated Please use setter;
- */
- @Deprecated
- public static void replaceStyleAttribute(UIComponent component, String attribute,
- String styleAttribute, String value) {
- Deprecation.LOG.error("HtmlRendererUtil.replaceStyleAttribute() no longer supported. Use setter.");
- }
-
- /**
- * @deprecated Please use setter;
- */
- @Deprecated
- public static void replaceStyleAttribute(UIComponent component, String styleAttribute, int value) {
- Deprecation.LOG.error("HtmlRendererUtil.replaceStyleAttribute() no longer supported. Use setter.");
- }
-
- /**
- * @deprecated Please use setter;
- */
- @Deprecated
- public static void replaceStyleAttribute(UIComponent component, String attribute,
- String styleAttribute, int value) {
- Deprecation.LOG.error("HtmlRendererUtil.replaceStyleAttribute() no longer supported. Use setter.");
-
- }
-
public static HtmlStyleMap ensureStyleAttributeMap(UIComponent component) {
return ensureStyleAttributeMap(component, Attributes.STYLE);
}
@@ -266,7 +231,7 @@
*/
@Deprecated
public static void removeStyleAttribute(UIComponent component, String name) {
- Deprecation.LOG.error("HtmlRendererUtil.removeStyleAttribute() no longer supported. Use setter.");
+ Deprecation.LOG.error("HtmlRendererUtils.removeStyleAttribute() no longer supported. Use setter.");
}
/**
@@ -279,12 +244,12 @@
@Deprecated
public static void createHeaderAndBodyStyles(FacesContext facesContext, UIComponent component) {
- Deprecation.LOG.error("HtmlRendererUtil.createHeaderAndBodyStyles() no longer supported");
+ Deprecation.LOG.error("HtmlRendererUtils.createHeaderAndBodyStyles() no longer supported");
}
@Deprecated
public static void createHeaderAndBodyStyles(FacesContext facesContext, UIComponent component, boolean width) {
- Deprecation.LOG.error("HtmlRendererUtil.createHeaderAndBodyStyles() no longer supported");
+ Deprecation.LOG.error("HtmlRendererUtils.createHeaderAndBodyStyles() no longer supported");
}
/**
@@ -351,35 +316,6 @@
}
}
- /**
- * @deprecated use TobagoResponseWriter.writeJavascript()
- */
- @Deprecated
- public static void writeJavascript(ResponseWriter writer, String script) throws IOException {
- startJavascript(writer);
- writer.write(script);
- endJavascript(writer);
- }
-
- /**
- * @deprecated use TobagoResponseWriter.writeJavascript()
- */
- @Deprecated
- public static void startJavascript(ResponseWriter writer) throws IOException {
- writer.startElement(HtmlConstants.SCRIPT, null);
- writer.writeAttribute(HtmlAttributes.TYPE, "text/javascript", null);
- writer.write("\n<!--\n");
- }
-
- /**
- * @deprecated use TobagoResponseWriter.writeJavascript()
- */
- @Deprecated
- public static void endJavascript(ResponseWriter writer) throws IOException {
- writer.write("\n// -->\n");
- writer.endElement(HtmlConstants.SCRIPT);
- }
-
public static void writeScriptLoader(FacesContext facesContext, String script)
throws IOException {
writeScriptLoader(facesContext, new String[]{script}, null);
@@ -387,7 +323,7 @@
public static void writeScriptLoader(FacesContext facesContext, String[] scripts, String[] afterLoadCmds)
throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
String allScripts = "[]";
if (scripts != null) {
@@ -433,7 +369,7 @@
public static void writeStyleLoader(
FacesContext facesContext, String[] styles) throws IOException {
- TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
+ TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startJavascript();
writer.write("Tobago.ensureStyleFiles(");
@@ -444,7 +380,7 @@
public static String getTitleFromTipAndMessages(FacesContext facesContext, UIComponent component) {
String messages = ComponentUtils.getFacesMessageAsString(facesContext, component);
- return HtmlRendererUtil.addTip(messages, component.getAttributes().get(Attributes.TIP));
+ return HtmlRendererUtils.addTip(messages, component.getAttributes().get(Attributes.TIP));
}
public static String addTip(String title, Object tip) {
@@ -599,7 +535,7 @@
strBuilder.append(",");
}
strBuilder.append("\"");
- strBuilder.append(HtmlRendererUtil.getComponentId(facesContext, command, list[i]));
+ strBuilder.append(HtmlRendererUtils.getComponentId(facesContext, command, list[i]));
strBuilder.append("\"");
}
strBuilder.append("]");
@@ -741,7 +677,7 @@
writer.write(" Tobago.addEventListener(element, \"");
writer.write(facetEntry.getKey());
writer.write("\", function(){Tobago.reloadComponent(this, '");
- writer.write(HtmlRendererUtil.getComponentIds(facesContext, facetEntry.getValue(),
+ writer.write(HtmlRendererUtils.getComponentIds(facesContext, facetEntry.getValue(),
((UICommand) facetEntry.getValue()).getRenderedPartially()));
writer.write("','");
writer.write(facetEntry.getValue().getClientId(facesContext));
Propchange: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java?rev=831397&r1=831396&r2=831397&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtil.java Fri Oct 30 17:26:30 2009
@@ -125,7 +125,7 @@
}
}
- //TODO move to HtmlRendererUtil
+ //TODO move to HtmlRendererUtils
public static String addMenuCheckToggle(String clientId, String onClick) {
if (onClick != null) {
onClick = " ; " + onClick;