Author: drobiazko
Date: Tue Aug 24 06:36:28 2010
New Revision: 988401
URL: http://svn.apache.org/viewvc?rev=988401&view=rev
Log:
TAP5-1254: The decorateComponentEventLink event name is misspelled
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecorateComponentEventLinkDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecoratePageRenderLinkDemo.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecorateComponentEventLinkDemo.java
(with props)
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecoratePageRenderLinkDemo.java
(with props)
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java?rev=988401&r1=988400&r2=988401&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
Tue Aug 24 06:36:28 2010
@@ -210,7 +210,7 @@ public class EventConstants
*
* @since 5.2.0
*/
- public static final String DECORATE_COMPONENT_EVENT_LINK =
"decoreateComponentEventLink";
+ public static final String DECORATE_COMPONENT_EVENT_LINK =
"decorateComponentEventLink";
/**
* Name of a event triggered by the form component on the {...@linkplain
ComponentSource#getActivePage() active page}
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecorateComponentEventLinkDemo.tml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecorateComponentEventLinkDemo.tml?rev=988401&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecorateComponentEventLinkDemo.tml
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecorateComponentEventLinkDemo.tml
Tue Aug 24 06:36:28 2010
@@ -0,0 +1,10 @@
+<html t:type="Border"
+ xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";>
+
+ <h1>Decorate Component Event Link Demo</h1>
+
+ <p>Component Event Link Decorated: ${decorated}</p>
+
+ <p><t:actionlink>refresh</t:actionlink></p>
+
+</html>
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecoratePageRenderLinkDemo.tml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecoratePageRenderLinkDemo.tml?rev=988401&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecoratePageRenderLinkDemo.tml
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/DecoratePageRenderLinkDemo.tml
Tue Aug 24 06:36:28 2010
@@ -0,0 +1,10 @@
+<html t:type="Border"
+ xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";>
+
+ <h1>Decorate Page Render Link Demo</h1>
+
+ <p>Page Render Link Decorated: ${decorated}</p>
+
+ <p><t:pageLink page="decoratepagerenderlinkdemo">refresh</t:pageLink></p>
+
+</html>
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java?rev=988401&r1=988400&r2=988401&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
Tue Aug 24 06:36:28 2010
@@ -1506,4 +1506,26 @@ public class CoreBehaviorsTests extends
assertText("id=no-override", "[pre-app]");
assertText("id=override", "[app]");
}
+
+ /** TAP5-1254 */
+ @Test
+ public void decorate_page_render_link()
+ {
+ clickThru("Decorate Page Render Link Demo");
+
+ clickAndWait("link=refresh");
+
+ assertTextPresent("Page Render Link Decorated: true");
+ }
+
+ /** TAP5-1254 */
+ @Test
+ public void decorate_component_event_link()
+ {
+ clickThru("Decorate Component Event Link Demo");
+
+ clickAndWait("link=refresh");
+
+ assertTextPresent("Component Event Link Decorated: true");
+ }
}
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecorateComponentEventLinkDemo.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecorateComponentEventLinkDemo.java?rev=988401&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecorateComponentEventLinkDemo.java
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecorateComponentEventLinkDemo.java
Tue Aug 24 06:36:28 2010
@@ -0,0 +1,41 @@
+// Copyright 2010 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.integration.app1.pages;
+
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.RequestParameter;
+import org.apache.tapestry5.services.ComponentEventRequestParameters;
+
+
+public class DecorateComponentEventLinkDemo
+{
+
+ @Property
+ @Persist
+ private boolean decorated;
+
+ void onDecorateComponentEventLink(Link link,
ComponentEventRequestParameters params)
+ {
+ link.addParameter("decorated", "true");
+ }
+
+
+ void onAction(@RequestParameter("decorated") boolean decorated)
+ {
+ this.decorated = decorated;
+ }
+}
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecorateComponentEventLinkDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecorateComponentEventLinkDemo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecoratePageRenderLinkDemo.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecoratePageRenderLinkDemo.java?rev=988401&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecoratePageRenderLinkDemo.java
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecoratePageRenderLinkDemo.java
Tue Aug 24 06:36:28 2010
@@ -0,0 +1,39 @@
+// Copyright 2010 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.integration.app1.pages;
+
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.RequestParameter;
+import org.apache.tapestry5.services.PageRenderRequestParameters;
+
+
+public class DecoratePageRenderLinkDemo
+{
+ @Property
+ @Persist
+ private boolean decorated;
+
+ void onDecoratePageRenderLink(Link link, PageRenderRequestParameters
params)
+ {
+ link.addParameter("decorated", "true");
+ }
+
+ void onActivate(@RequestParameter(value="decorated", allowBlank=true)
boolean decorated)
+ {
+ this.decorated = decorated;
+ }
+}
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecoratePageRenderLinkDemo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DecoratePageRenderLinkDemo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=988401&r1=988400&r2=988401&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
Tue Aug 24 06:36:28 2010
@@ -450,7 +450,11 @@ public class Index
new Item("SelectDemo", "Select Demo", "Validation
decoration for Select"),
new Item("SelectModelFromObjectsAndPropertyNameDemo",
"SelectModel from objects and property name",
- "Creating a SelectModel from a list of objects and
a label property name")
+ "Creating a SelectModel from a list of objects and
a label property name"),
+
+ new Item("DecoratePageRenderLinkDemo", "Decorate Page
Render Link Demo", "Decorating page render links"),
+
+ new Item("DecorateComponentEventLinkDemo", "Decorate
Component Event Link Demo", "Decorating event links")
);
