You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/04/27 16:02:27 UTC
svn commit: r651955 - in /myfaces/tobago/trunk/theme:
scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/
Author: bommel
Date: Sun Apr 27 07:02:26 2008
New Revision: 651955
URL: http://svn.apache.org/viewvc?rev=651955&view=rev
Log:
(TOBAGO-655) Create a prepareRender Phase
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java?rev=651955&r1=651954&r2=651955&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ImageRenderer.java Sun Apr 27 07:02:26 2008
@@ -44,10 +44,13 @@
import java.util.Locale;
public class ImageRenderer extends LayoutableRendererBase {
-
private static final Log LOG = LogFactory.getLog(ImageRenderer.class);
+ public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ super.prepareRender(facesContext, component);
+ HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ }
public void encodeEnd(FacesContext facesContext,
UIComponent component) throws IOException {
@@ -106,7 +109,7 @@
writer.writeClassAttribute();
writer.endElement(HtmlConstants.IMG);
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+
}
private String createSrc(String src, String ext) {
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=651955&r1=651954&r2=651955&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 Sun Apr 27 07:02:26 2008
@@ -110,7 +110,6 @@
writer.endElement(HtmlConstants.SPAN);
*/
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
writer.endElement(HtmlConstants.DIV);
}
attributes.put(MENU_ACCELERATOR_KEYS, new ArrayList<String>());
@@ -141,6 +140,10 @@
public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
super.prepareRender(facesContext, component);
if (facesContext instanceof PageFacesContextWrapper) {
+ if (!ComponentUtil.getBooleanAttribute(component, ATTR_MENU_POPUP)) {
+ HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ }
+
final String[] scripts = new String[]{"script/tobago-menu.js"};
((PageFacesContextWrapper) facesContext).getScriptFiles().add(scripts[0]);
@@ -180,7 +183,7 @@
protected String createJavascriptFunction(FacesContext facesContext,
UIComponent component, String setupFunction)
throws IOException {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder(256);
sb.append("function ");
sb.append(setupFunction);
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=651955&r1=651954&r2=651955&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 Sun Apr 27 07:02:26 2008
@@ -137,6 +137,7 @@
formAction = facesContext.getExternalContext().encodeActionURL(formAction);
String contentType = writer.getContentTypeWithCharSet();
ResponseUtils.ensureContentTypeHeader(facesContext, contentType);
+ HtmlRendererUtil.renderDojoDndSource(facesContext, component);
String title = (String) page.getAttributes().get(ATTR_LABEL);
@@ -337,8 +338,6 @@
writer.writeJavascript("TbgTimer.startBody = new Date();");
//}
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
-
writer.startElement(HtmlConstants.FORM, page);
writer.writeNameAttribute(
clientId + SUBCOMPONENT_SEP + "form");
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=651955&r1=651954&r2=651955&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 Sun Apr 27 07:02:26 2008
@@ -52,6 +52,11 @@
private static final Log LOG = LogFactory.getLog(PanelRenderer.class);
+ public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ super.prepareRender(facesContext, component);
+ HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ }
+
public boolean getRendersChildren() {
return true;
}
@@ -133,7 +138,6 @@
writer.writeClassAttribute();
writer.writeIdAttribute(clientId);
writer.writeStyleAttribute();
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
if (TobagoConfig.getInstance(facesContext).isAjaxEnabled()) {
// writer.writeJavascript("Tobago.addAjaxComponent(\"" + clientId + "\")");
Integer frequency = null;
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=651955&r1=651954&r2=651955&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 Sun Apr 27 07:02:26 2008
@@ -76,6 +76,11 @@
private static final Log LOG = LogFactory.getLog(ToolBarRenderer.class);
+ public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ super.prepareRender(facesContext, component);
+ HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ }
+
public void encodeEnd(FacesContext facesContext,
UIComponent uiComponent) throws IOException {
@@ -93,7 +98,6 @@
HtmlRendererUtil.renderDojoDndItem(toolbar, writer, true);
writer.writeClassAttribute();
writer.writeStyleAttribute();
- HtmlRendererUtil.renderDojoDndSource(facesContext, toolbar);
writer.startElement(HtmlConstants.DIV, toolbar);
boolean right = false;
if (toolbar instanceof UIToolBar) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java?rev=651955&r1=651954&r2=651955&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeOldRenderer.java Sun Apr 27 07:02:26 2008
@@ -224,9 +224,8 @@
}
private String[] createJavascript(FacesContext facesContext, String clientId,
- UITreeOld tree, UITreeOldNode root)
- throws IOException {
- StringBuilder sb = new StringBuilder();
+ UITreeOld tree, UITreeOldNode root) throws IOException {
+ StringBuilder sb = new StringBuilder(128);
sb.append("{\n");
@@ -288,7 +287,10 @@
String clientId = tree.getClientId(facesContext);
String jsClientId = TreeOldRenderer.createJavascriptVariable(clientId);
- String treeNodeCommandVar = " var " + jsClientId + "_treeNodeCommand = ";
+ StringBuilder sb = new StringBuilder(64);
+ sb.append(" var ");
+ sb.append(jsClientId);
+ sb.append("_treeNodeCommand = ");
UICommand treeNodeCommand = (UICommand) tree.getFacet(UITreeOld.FACET_TREE_NODE_COMMAND);
if (treeNodeCommand != null) {
CommandRendererHelper helper = new CommandRendererHelper(facesContext,
@@ -297,14 +299,16 @@
String onclick = helper.getOnclick();
String treeNodeCommandClientId = treeNodeCommand.getClientId(facesContext);
onclick = onclick.replaceAll("'" + treeNodeCommandClientId + "'", "this.id");
- treeNodeCommandVar += "\"" + onclick + "\";\n";
+ sb.append("\"");
+ sb.append(onclick);
+ sb.append("\";\n");
} else {
- treeNodeCommandVar += "null;\n";
+ sb.append("null;\n");
}
} else {
- treeNodeCommandVar += "null;\n";
+ sb.append("null;\n");
}
- return treeNodeCommandVar;
+ return sb.toString();
}
protected String getNodesAsJavascript(FacesContext facesContext, UITreeOldNode root) throws IOException {
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=651955&r1=651954&r2=651955&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 Sun Apr 27 07:02:26 2008
@@ -56,7 +56,12 @@
private static final Log LOG = LogFactory.getLog(BoxRenderer.class);
public static final String CONTENT_INNER = SUBCOMPONENT_SEP + "content-inner";
public static final String HEADER = SUBCOMPONENT_SEP + "header";
-
+
+ public void prepareRender(FacesContext facesContext, UIComponent component) throws IOException {
+ super.prepareRender(facesContext, component);
+ HtmlRendererUtil.renderDojoDndSource(facesContext, component);
+ }
+
public int getFixedHeight(FacesContext facesContext, UIComponent component) {
return super.getFixedHeight(facesContext, component);
}
@@ -112,7 +117,6 @@
}
writer.writeClassAttribute(contentInnerClasses);
writer.writeStyleAttribute(innerStyle);
- HtmlRendererUtil.renderDojoDndSource(facesContext, component);
}