You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/07/09 18:40:31 UTC
cvs commit: jakarta-tapestry/examples/Workbench/src/context/WEB-INF Dates.page
hlship 2005/07/09 09:40:31
Modified: . status.xml
framework/src/test/org/apache/tapestry/enhance
TestInjectObjectWorker.java
framework/src/java/org/apache/tapestry/enhance
InjectObjectWorker.java
examples/Workbench/src/context/WEB-INF Dates.page
Log:
TAPESTRY-391: Cannot inject the same bean twice
Revision Changes Path
1.158 +1 -0 jakarta-tapestry/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/status.xml,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- status.xml 9 Jul 2005 16:23:23 -0000 1.157
+++ status.xml 9 Jul 2005 16:40:31 -0000 1.158
@@ -65,6 +65,7 @@
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-389">asset service: send 304 status code when appropriate</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-374" due-to="Paul Green">Script component is not picking up the symbols parameter</action>
<action type="add" dev="HLS">Add blank component reference pages for If and For</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-391">Cannot inject the same bean twice</action>
</release>
<release version="4.0-beta-1" date="Jun 24 2005">
<action type="add" dev="HLS">Add InvokeListener component.</action>
1.4 +6 -2 jakarta-tapestry/framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java
Index: TestInjectObjectWorker.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/test/org/apache/tapestry/enhance/TestInjectObjectWorker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestInjectObjectWorker.java 7 Jun 2005 17:41:40 -0000 1.3
+++ TestInjectObjectWorker.java 9 Jul 2005 16:40:31 -0000 1.4
@@ -68,13 +68,17 @@
pc.setReturnValue(injectedValue);
+ // When the same bean is injected multiple times, the field name
+ // returned won't match the field name suggested; make sure the code
+ // generation used the correct field name.
+
op.addInjectedField("_$fred", Object.class, injectedValue);
- opc.setReturnValue("_$fred");
+ opc.setReturnValue("_$gnarly");
op.addMethod(
Modifier.PUBLIC,
new MethodSignature(Object.class, "getFred", null, null),
- "return _$fred;");
+ "return _$gnarly;");
replayControls();
1.6 +1 -3 jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/InjectObjectWorker.java
Index: InjectObjectWorker.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/InjectObjectWorker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InjectObjectWorker.java 9 Jun 2005 22:53:48 -0000 1.5
+++ InjectObjectWorker.java 9 Jul 2005 16:40:31 -0000 1.6
@@ -54,8 +54,6 @@
if (propertyType == null)
propertyType = Object.class;
- String fieldName = "_$" + propertyName;
-
op.claimProperty(propertyName);
Object injectedValue = _provider.obtainValue(objectReference, location);
@@ -70,7 +68,7 @@
injectedValue,
propertyType), location, null);
- op.addInjectedField(fieldName, propertyType, injectedValue);
+ String fieldName = op.addInjectedField("_$" + propertyName, propertyType, injectedValue);
String methodName = EnhanceUtils.createAccessorMethodName(propertyName);
1.9 +4 -4 jakarta-tapestry/examples/Workbench/src/context/WEB-INF/Dates.page
Index: Dates.page
===================================================================
RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/context/WEB-INF/Dates.page,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Dates.page 16 Jun 2005 09:00:43 -0000 1.8
+++ Dates.page 9 Jul 2005 16:40:31 -0000 1.9
@@ -28,11 +28,11 @@
<property name="startDate" persist="client"/>
<property name="endDate" persist="client"/>
- <bean name="maxDateValidator" class="org.apache.tapestry.form.validator.DateValidator">
- <set name="max" value="new java.util.Date()"></set>
+ <bean name="maxDateValidator" class="org.apache.tapestry.form.validator.MaxDate">
+ <set name="maxDate" value="new java.util.Date()"></set>
</bean>
- <bean name="minDateValidator" class="org.apache.tapestry.form.validator.DateValidator">
- <set name="min" value="new java.util.Date()"></set>
+ <bean name="minDateValidator" class="org.apache.tapestry.form.validator.MinDate">
+ <set name="minDate" value="new java.util.Date()"></set>
</bean>
<component id="inputEnabled" type="Checkbox">
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org