You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2007/09/14 03:07:32 UTC
svn commit: r575507 - in /tapestry/tapestry4/trunk: tapestry-examples/
tapestry-examples/Workbench/
tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/
tapestry-framework/src/java/org/apache/tapestry/markup/
tapestry-framework/src/java/...
Author: jkuhnert
Date: Thu Sep 13 18:07:32 2007
New Revision: 575507
URL: http://svn.apache.org/viewvc?rev=575507&view=rev
Log:
Fixes TAPESTRY-975. FieldLabel was calling renderInformalParameters ~after~ letting the validation delegate run. By default AbstractComponent calls IMarkupWriter.attribute(name, value) when writing informal parameters - thus blowing away any conflicting attributes written by IValidationDelegate.
Modified:
tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java
tapestry/tapestry4/trunk/tapestry-examples/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml?rev=575507&r1=575506&r2=575507&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/pom.xml Thu Sep 13 18:07:32 2007
@@ -4,13 +4,13 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-Workbench</artifactId>
<packaging>war</packaging>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
</parent>
<name>Tapestry Workbench</name>
Modified: tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java?rev=575507&r1=575506&r2=575507&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/java/org/apache/tapestry/workbench/WorkbenchValidationDelegate.java Thu Sep 13 18:07:32 2007
@@ -14,10 +14,6 @@
package org.apache.tapestry.workbench;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.form.IFormComponent;
-import org.apache.tapestry.valid.IValidator;
import org.apache.tapestry.valid.ValidationDelegate;
/**
@@ -27,5 +23,4 @@
public class WorkbenchValidationDelegate extends ValidationDelegate
{
-
}
Modified: tapestry/tapestry4/trunk/tapestry-examples/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/pom.xml?rev=575507&r1=575506&r2=575507&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/pom.xml Thu Sep 13 18:07:32 2007
@@ -4,12 +4,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-examples</artifactId>
<packaging>pom</packaging>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
<!-- This should change to tapestry-project -->
<parent>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
</parent>
<name>Examples</name>
<inceptionYear>2006</inceptionYear>
@@ -24,17 +24,17 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-framework</artifactId>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-annotations</artifactId>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-contrib</artifactId>
- <version>4.1.3</version>
+ <version>4.1.4-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java?rev=575507&r1=575506&r2=575507&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/MarkupWriterImpl.java Thu Sep 13 18:07:32 2007
@@ -135,8 +135,10 @@
DefaultAttribute attr = (DefaultAttribute)_attrMap.get(name);
- if (attr == null) {
+ if (attr == null)
+ {
attr = new DefaultAttribute(value, false);
+
_attrMap.put(name, attr);
return;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java?rev=575507&r1=575506&r2=575507&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/FieldLabel.java Thu Sep 13 18:07:32 2007
@@ -14,13 +14,7 @@
package org.apache.tapestry.valid;
-import org.apache.tapestry.AbstractComponent;
-import org.apache.tapestry.BindingException;
-import org.apache.tapestry.IForm;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IRequestCycle;
-import org.apache.tapestry.Tapestry;
-import org.apache.tapestry.TapestryUtils;
+import org.apache.tapestry.*;
import org.apache.tapestry.form.IFormComponent;
/**
@@ -67,8 +61,7 @@
displayName = field.getDisplayName();
if (displayName == null)
- throw new BindingException(ValidMessages.noDisplayName(this,
- field), this, null, getBinding("field"), null);
+ throw new BindingException(ValidMessages.noDisplayName(this,field), this, null, getBinding("field"), null);
}
IValidationDelegate delegate = form.getDelegate();
@@ -79,12 +72,13 @@
delegate.writeLabelPrefix(field, writer, cycle);
writer.begin("label");
-
+
+ renderInformalParameters(writer, cycle);
+
if (id != null)
writer.attribute("for", id);
-
+
delegate.writeLabelAttributes(writer, cycle, field);
- renderInformalParameters(writer, cycle);
delegate.beforeLabelText(writer, cycle, field);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java?rev=575507&r1=575506&r2=575507&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java Thu Sep 13 18:07:32 2007
@@ -14,15 +14,15 @@
package org.apache.tapestry.markup;
-import java.io.CharArrayWriter;
-import java.io.PrintWriter;
-
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
+import java.io.CharArrayWriter;
+import java.io.PrintWriter;
+
/**
* Tests for {@link org.apache.tapestry.markup.MarkupWriterImpl}.
*
@@ -81,7 +81,7 @@
_writer.reset();
}
- public void testIntAttribute()
+ public void test_Int_Attribute()
{
MarkupFilter filter = new EchoMarkupFilter();
PrintWriter writer = newPrintWriter();
@@ -99,7 +99,7 @@
assertOutput("<span width=\"{5}\"></span>");
}
- public void testIntAttributeRequiresTag()
+ public void test_Int_Attribute_Requires_Tag()
{
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
@@ -121,7 +121,7 @@
verify();
}
- public void testBooleanAttribute()
+ public void test_Boolean_Attribute()
{
MarkupFilter filter = new EchoMarkupFilter();
PrintWriter writer = newPrintWriter();
@@ -141,7 +141,7 @@
assertOutput("<div true=\"{true}\" false=\"{false}\"></div>");
}
- public void testBooleanAttributeRequiresTag()
+ public void test_Boolean_Attribute_Requires_Tag()
{
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
@@ -163,7 +163,7 @@
verify();
}
- public void testAttribute()
+ public void test_Attribute()
{
MarkupFilter filter = new EchoMarkupFilter();
PrintWriter writer = newPrintWriter();
@@ -179,7 +179,7 @@
assertOutput("<span width=\"{100%}\"></span>");
}
- public void testAttributeNull()
+ public void test_Attribute_Null()
{
MarkupFilter filter = new EchoMarkupFilter();
PrintWriter writer = newPrintWriter();
@@ -214,7 +214,7 @@
assertOutput("<span width=\"{80%}\"></span>");
}
- public void testAttributeRequiresTag()
+ public void test_Attribute_Requires_Tag()
{
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
@@ -251,7 +251,7 @@
assertOutput("<span class=\"{fred barney}\" type=\"{false}\"></span>");
}
-
+
public void test_Append_Attribute_Null()
{
MarkupFilter filter = new EchoMarkupFilter();