Author: jkuhnert
Date: Fri Dec 8 13:21:09 2006
New Revision: 484784
URL: http://svn.apache.org/viewvc?view=rev&rev=484784
Log:
Resolves TAPESTRY-1177, ForBean was incorrectly setting render to true when the
element variable was null.
Updated workbench pom.xml jetty configuration to ~not~ scan directories for
changes, don't want/need jetty to do
any of this for us as Tapestry already handles dynamic loading of everything
I'm ok with having dynamically reloaded.
Fixed bug I created in the Palette javascript .script file by forgetting to
name the target "tapesytry" object
when doing even connections on form submission.
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.script
tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ITemplateComponent.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.script
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.script?view=diff&rev=484784&r1=484783&r2=484784
==============================================================================
Binary files - no diff available.
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml?view=diff&rev=484784&r1=484783&r2=484784
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml Fri Dec 8
13:21:09 2006
@@ -58,7 +58,6 @@
<version>6.1-SNAPSHOT</version>
<configuration>
<webAppSourceDirectory>${basedir}/src/context</webAppSourceDirectory>
- <scanIntervalSeconds>10</scanIntervalSeconds>
<contextPath>/</contextPath>
<systemProperties>
<systemProperty>
Modified:
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html?view=diff&rev=484784&r1=484783&r2=484784
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Border.html
Fri Dec 8 13:21:09 2006
@@ -1,5 +1,5 @@
<html jwcid="@Shell" stylesheet="asset:stylesheet"
- title="message:window.title" browserLogLevel="DEBUG"
consoleEnabled="true" debugEnabled="false">
+ title="message:window.title" browserLogLevel="DEBUG"
consoleEnabled="true" debugEnabled="true">
<body jwcid="@Body">
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ITemplateComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ITemplateComponent.java?view=diff&rev=484784&r1=484783&r2=484784
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ITemplateComponent.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/ITemplateComponent.java
Fri Dec 8 13:21:09 2006
@@ -15,7 +15,7 @@
package org.apache.tapestry;
/**
- * Extra interface implemented by [EMAIL PROTECTED]
org.apache.tapestry.BaseComponent}and inherited by
+ * Extra interface implemented by [EMAIL PROTECTED]
org.apache.tapestry.BaseComponent} and inherited by
* [EMAIL PROTECTED] org.apache.tapestry.html.BasePage}, used to allow them to
add contents from their
* templates.
*
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java?view=diff&rev=484784&r1=484783&r2=484784
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
Fri Dec 8 13:21:09 2006
@@ -139,7 +139,7 @@
String element = HiveMind.isNonBlank(getElement()) ? getElement() :
getTemplateTagName();
- boolean render = !cycleRewinding && (getRenderTag() ||
HiveMind.isNonBlank(getElement()));
+ boolean render = !cycleRewinding && HiveMind.isNonBlank(element);
IMarkupWriter loopWriter = writer;
@@ -163,7 +163,8 @@
// swap out writers if necessary
if (getResponseBuilder().isDynamic()
- && getResponseBuilder().contains(this) &&
!NestedMarkupWriterImpl.class.isInstance(writer)) {
+ && getResponseBuilder().contains(this)
+ && !NestedMarkupWriterImpl.class.isInstance(writer)) {
loopWriter = getResponseBuilder().getWriter(getClientId(),
ResponseBuilder.ELEMENT_TYPE);
}
