You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2010/06/28 19:26:22 UTC
svn commit: r958648 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/ main/java/org/apache/tapestry5/annotations/
main/java/org/apache/tapestry5/corelib/components/
main/java/org/apache/tapestry5/corelib/mixins/ main/jav...
Author: hlship
Date: Mon Jun 28 17:26:21 2010
New Revision: 958648
URL: http://svn.apache.org/viewvc?rev=958648&view=rev
Log:
TAP5-1195: Rename annotations @QueryParameter and @QueryParameterMapped (both introduced in 5.2.0) to more mnemonic names
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/RequestParameter.java (contents, props changed)
- copied, changed from r958124, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameter.java
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/RequestParameterDemo.tml
- copied, changed from r958124, tapestry/tapestry5/trunk/tapestry-core/src/test/app1/QueryParameterDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/RequestParameterTests.java (contents, props changed)
- copied, changed from r958124, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/QueryParameterTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RequestParameterDemo.java (contents, props changed)
- copied, changed from r958124, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/QueryParameterDemo.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameter.java
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/QueryParameterDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/QueryParameterTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/QueryParameterDemo.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/QueryParameterConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameterMapped.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng-limited.xml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ZoneDemo.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/QueryParameterConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/QueryParameterConstants.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/QueryParameterConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/QueryParameterConstants.java Mon Jun 28 17:26:21 2010
@@ -14,13 +14,13 @@
package org.apache.tapestry5;
-import org.apache.tapestry5.annotations.QueryParameter;
+import org.apache.tapestry5.annotations.RequestParameter;
import org.apache.tapestry5.corelib.components.Zone;
/**
* Defines constants for common query parameters passed in requests from the client.
*
- * @see QueryParameter
+ * @see RequestParameter
*/
public class QueryParameterConstants
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameterMapped.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameterMapped.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameterMapped.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameterMapped.java Mon Jun 28 17:26:21 2010
@@ -50,7 +50,7 @@ import org.apache.tapestry5.services.Val
* related to the {@link Persist} annotation). Invoking {@link ComponentResources#discardPersistentFieldChanges()} will
* <em>not</em> affect annotated fields, only assigning them back to null will.
*
- * @see QueryParameter
+ * @see RequestParameter
*/
@Target(
{ ElementType.FIELD })
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/RequestParameter.java (from r958124, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/RequestParameter.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/RequestParameter.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameter.java&r1=958124&r2=958648&rev=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/QueryParameter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/RequestParameter.java Mon Jun 28 17:26:21 2010
@@ -48,7 +48,7 @@ import org.apache.tapestry5.services.Req
@Documented
@UseWith(
{ COMPONENT, MIXIN, PAGE })
-public @interface QueryParameter
+public @interface RequestParameter
{
/** The name of the query parameter to extract from the request. */
String value();
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/RequestParameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java Mon Jun 28 17:26:21 2010
@@ -25,7 +25,7 @@ import org.apache.tapestry5.annotations.
import org.apache.tapestry5.annotations.Events;
import org.apache.tapestry5.annotations.Import;
import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.annotations.QueryParameter;
+import org.apache.tapestry5.annotations.RequestParameter;
import org.apache.tapestry5.corelib.base.AbstractField;
import org.apache.tapestry5.ioc.Messages;
import org.apache.tapestry5.ioc.annotations.Inject;
@@ -149,7 +149,7 @@ public class DateField extends AbstractF
* format acceptable to the JavaScript Date() constructor. Alternately, an "error" key indicates the the input was
* not formatted correct.
*/
- JSONObject onParse(@QueryParameter(INPUT_PARAMETER)
+ JSONObject onParse(@RequestParameter(INPUT_PARAMETER)
String input)
{
JSONObject response = new JSONObject();
@@ -173,7 +173,7 @@ public class DateField extends AbstractF
* milliseconds since the epoch, to the server, which reformats it according to the server side format and returns
* the result.
*/
- JSONObject onFormat(@QueryParameter(INPUT_PARAMETER)
+ JSONObject onFormat(@RequestParameter(INPUT_PARAMETER)
String input)
{
JSONObject response = new JSONObject();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java Mon Jun 28 17:26:21 2010
@@ -20,7 +20,7 @@ import org.apache.tapestry5.*;
import org.apache.tapestry5.annotations.Environmental;
import org.apache.tapestry5.annotations.Events;
import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.annotations.QueryParameter;
+import org.apache.tapestry5.annotations.RequestParameter;
import org.apache.tapestry5.annotations.SupportsInformalParameters;
import org.apache.tapestry5.corelib.data.InsertPosition;
import org.apache.tapestry5.corelib.internal.ComponentActionSink;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java Mon Jun 28 17:26:21 2010
@@ -20,7 +20,7 @@ import org.apache.tapestry5.annotations.
import org.apache.tapestry5.annotations.Events;
import org.apache.tapestry5.annotations.Mixin;
import org.apache.tapestry5.annotations.Parameter;
-import org.apache.tapestry5.annotations.QueryParameter;
+import org.apache.tapestry5.annotations.RequestParameter;
import org.apache.tapestry5.corelib.base.AbstractField;
import org.apache.tapestry5.corelib.data.BlankOption;
import org.apache.tapestry5.corelib.mixins.RenderDisabled;
@@ -214,7 +214,7 @@ public class Select extends AbstractFiel
}
}
- Object onChange(@QueryParameter(value = "t:selectvalue", allowBlank = true)
+ Object onChange(@RequestParameter(value = "t:selectvalue", allowBlank = true)
final String selectValue)
{
final Object newValue = toValue(selectValue);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java Mon Jun 28 17:26:21 2010
@@ -24,7 +24,7 @@ import org.apache.tapestry5.annotations.
import org.apache.tapestry5.annotations.InjectContainer;
import org.apache.tapestry5.annotations.Parameter;
import org.apache.tapestry5.annotations.Path;
-import org.apache.tapestry5.annotations.QueryParameter;
+import org.apache.tapestry5.annotations.RequestParameter;
import org.apache.tapestry5.internal.util.Holder;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.ioc.services.TypeCoercer;
@@ -171,7 +171,7 @@ public class Autocomplete
renderSupport.addInit("autocompleter", new JSONArray(id, menuId, link.toAbsoluteURI(), config));
}
- Object onAutocomplete(@QueryParameter(PARAM_NAME)
+ Object onAutocomplete(@RequestParameter(PARAM_NAME)
String input)
{
final Holder<List> matchesHolder = Holder.create();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java Mon Jun 28 17:26:21 2010
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.tapestry5.EventContext;
import org.apache.tapestry5.ValueEncoder;
import org.apache.tapestry5.annotations.OnEvent;
-import org.apache.tapestry5.annotations.QueryParameter;
+import org.apache.tapestry5.annotations.RequestParameter;
import org.apache.tapestry5.func.Predicate;
import org.apache.tapestry5.internal.services.ComponentClassCache;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
@@ -242,7 +242,7 @@ public class OnEventWorker implements Co
continue;
}
- QueryParameter parameterAnnotation = method.getParameterAnnotation(i, QueryParameter.class);
+ RequestParameter parameterAnnotation = method.getParameterAnnotation(i, RequestParameter.class);
if (parameterAnnotation != null)
{
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/RequestParameterDemo.tml (from r958124, tapestry/tapestry5/trunk/tapestry-core/src/test/app1/QueryParameterDemo.tml)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/RequestParameterDemo.tml?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/app1/RequestParameterDemo.tml&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/app1/QueryParameterDemo.tml&r1=958124&r2=958648&rev=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/QueryParameterDemo.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/RequestParameterDemo.tml Mon Jun 28 17:26:21 2010
@@ -1,6 +1,6 @@
<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <h1>QueryParameter Annotation Demo</h1>
+ <h1>@RequestParameter Annotation Demo</h1>
<p>
The current value is:
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng-limited.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng-limited.xml?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng-limited.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng-limited.xml Mon Jun 28 17:26:21 2010
@@ -7,12 +7,13 @@
<test name="Limited Integration Tests">
<parameter name="tapestry.web-app-folder" value="src/test/app1"/>
+ <packages>
+ <package name="org.apache.tapestry5.integration.app1"/>
+ </packages>
+
<classes>
<class name="org.apache.tapestry5.test.SeleniumLauncher"/>
- <!-- Modify classes below as needed. -->
- <class name="org.apache.tapestry5.integration.app1.QueryParameterMappedTests"/>
-
</classes>
</test>
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/RequestParameterTests.java (from r958124, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/QueryParameterTests.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/RequestParameterTests.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/RequestParameterTests.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/QueryParameterTests.java&r1=958124&r2=958648&rev=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/QueryParameterTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/RequestParameterTests.java Mon Jun 28 17:26:21 2010
@@ -17,12 +17,12 @@ package org.apache.tapestry5.integration
import org.apache.tapestry5.integration.TapestryCoreTestCase;
import org.testng.annotations.Test;
-public class QueryParameterTests extends TapestryCoreTestCase
+public class RequestParameterTests extends TapestryCoreTestCase
{
@Test
public void successful_use_of_query_parameter_annotation()
{
- clickThru("QueryParameter Annotation Demo", "Working Link");
+ clickThru("RequestParameter Annotation Demo", "Working Link");
assertText("id=current", "97");
}
@@ -30,30 +30,30 @@ public class QueryParameterTests extends
@Test
public void null_value_when_not_allowed()
{
- clickThru("QueryParameter Annotation Demo", "Null Link");
+ clickThru("RequestParameter Annotation Demo", "Null Link");
assertTextPresent(
- "Unable process query parameter 'gnip' as parameter #1 of event handler method void onFrob(int) (in class org.apache.tapestry5.integration.app1.pages.QueryParameterDemo)",
+ "Unable process query parameter 'gnip' as parameter #1 of event handler method void onFrob(int) (in class org.apache.tapestry5.integration.app1.pages.RequestParameterDemo)",
"The value for query parameter 'gnip' was blank, but a non-blank value is needed.");
}
@Test
public void null_for_primitive_when_allowed()
{
- clickThru("QueryParameter Annotation Demo", "Null Allowed Link");
+ clickThru("RequestParameter Annotation Demo", "Null Allowed Link");
assertTextPresent(
- "Unable process query parameter 'gnip' as parameter #1 of event handler method void onFrobNullAllowed(int) (in class org.apache.tapestry5.integration.app1.pages.QueryParameterDemo)",
+ "Unable process query parameter 'gnip' as parameter #1 of event handler method void onFrobNullAllowed(int) (in class org.apache.tapestry5.integration.app1.pages.RequestParameterDemo)",
"Query parameter 'gnip' evaluates to null, but the event method parameter is type int, a primitive.");
}
@Test
public void type_mismatch_for_method_parameter()
{
- clickThru("QueryParameter Annotation Demo", "Broken Link");
+ clickThru("RequestParameter Annotation Demo", "Broken Link");
assertTextPresent(
- "Unable process query parameter 'gnip' as parameter #1 of event handler method void onFrob(int) (in class org.apache.tapestry5.integration.app1.pages.QueryParameterDemo)",
+ "Unable process query parameter 'gnip' as parameter #1 of event handler method void onFrob(int) (in class org.apache.tapestry5.integration.app1.pages.RequestParameterDemo)",
"Coercion of frodo to type java.lang.Integer");
}
}
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/RequestParameterTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java Mon Jun 28 17:26:21 2010
@@ -86,8 +86,8 @@ public class Index
new Item("ReloadDemo", "Reloadable Service Implementation Demo",
"Used when manually testing service reloads"),
- new Item("QueryParameterDemo", "QueryParameter Annotation Demo",
- "Use of @QueryParameter annotation on event handler method parameters"),
+ new Item("RequestParameterDemo", "RequestParameter Annotation Demo",
+ "Use of @RequestParameter annotation on event handler method parameters"),
new Item("CancelDemo", "Cancel Demo", "Use of the cancel option with Submit"),
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RequestParameterDemo.java (from r958124, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/QueryParameterDemo.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RequestParameterDemo.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RequestParameterDemo.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/QueryParameterDemo.java&r1=958124&r2=958648&rev=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/QueryParameterDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RequestParameterDemo.java Mon Jun 28 17:26:21 2010
@@ -18,10 +18,10 @@ import org.apache.tapestry5.ComponentRes
import org.apache.tapestry5.Link;
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.annotations.Property;
-import org.apache.tapestry5.annotations.QueryParameter;
+import org.apache.tapestry5.annotations.RequestParameter;
import org.apache.tapestry5.ioc.annotations.Inject;
-public class QueryParameterDemo
+public class RequestParameterDemo
{
private static final String PARAMETER_NAME = "gnip";
@@ -60,13 +60,13 @@ public class QueryParameterDemo
return resources.createEventLink("frobNullAllowed");
}
- void onFrob(@QueryParameter(PARAMETER_NAME)
+ void onFrob(@RequestParameter(PARAMETER_NAME)
int value)
{
this.value = value;
}
- void onFrobNullAllowed(@QueryParameter(value = PARAMETER_NAME, allowBlank = true)
+ void onFrobNullAllowed(@RequestParameter(value = PARAMETER_NAME, allowBlank = true)
int value)
{
this.value = value;
Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RequestParameterDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ZoneDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ZoneDemo.java?rev=958648&r1=958647&r2=958648&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ZoneDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ZoneDemo.java Mon Jun 28 17:26:21 2010
@@ -73,7 +73,7 @@ public class ZoneDemo
}
@Log
- Object onActionFromSelect(String name, @QueryParameter(QueryParameterConstants.ZONE_ID)
+ Object onActionFromSelect(String name, @RequestParameter(QueryParameterConstants.ZONE_ID)
String zoneId)
{
if (!zoneId.equals("output"))