Author: hlship
Date: Mon Aug 18 15:47:44 2008
New Revision: 686888
URL: http://svn.apache.org/viewvc?rev=686888&view=rev
Log:
TAPESTRY-2601: ComponentResources.createActionLink() is incorrectly named,
should be createEventLink()
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.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/GridPager.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/services/ActionRenderResponseGeneratorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
Mon Aug 18 15:47:44 2008
@@ -161,7 +161,7 @@
/**
- * Creates a component action request link as a callback for this
component. The event type and context (as well as
+ * Creates a component event request link as a callback for this
component. The event type and context (as well as
* the page name and nested component id) will be encoded into a URL. A
request for the URL will [EMAIL PROTECTED]
* #triggerEvent(String, Object[], ComponentEventCallback)} trigger} the
named event on the component.
*
@@ -172,11 +172,39 @@
* @param context additional objects to be encoded into the path portion
of the link; each is converted to a
* string and URI encoded
* @return link object for the callback
+ * @deprecated Use [EMAIL PROTECTED] #createEventLink(String, Object[])}
instead
*/
Link createActionLink(String eventType, boolean forForm, Object...
context);
/**
- * Creates a render request link to a specific page.
+ * Creates a component event request link as a callback for this
component. The event type and context (as well as
+ * the page name and nested component id) will be encoded into a URL. A
request for the URL will [EMAIL PROTECTED]
+ * #triggerEvent(String, Object[], ComponentEventCallback)} trigger} the
named event on the component.
+ *
+ * @param eventType the type of event to be triggered. Event types should
be Java identifiers (contain only
+ * letters, numbers and the underscore).
+ * @param context additional objects to be encoded into the path portion
of the link; each is converted to a
+ * string and URI encoded
+ * @return link object for the callback
+ */
+ Link createEventLink(String eventType, Object... context);
+
+ /**
+ * Creates a component event request link as a callback for this
component. The event type and context (as well as
+ * the page name and nested component id) will be encoded into a URL. A
request for the URL will [EMAIL PROTECTED]
+ * #triggerEvent(String, Object[], ComponentEventCallback)} trigger} the
named event on the component. This is only
+ * used for form submission events, as extra data may be encoded in the
form as hidden fields.
+ *
+ * @param eventType the type of event to be triggered. Event types should
be Java identifiers (contain only
+ * letters, numbers and the underscore).
+ * @param context additional objects to be encoded into the path portion
of the link; each is converted to a
+ * string and URI encoded
+ * @return link object for the callback
+ */
+ Link createFormEventLink(String eventType, Object... context);
+
+ /**
+ * Creates a page render request link to render a specific page.
*
* @param pageName the logical name of the page to link to
* @param override if true, the context is used even if empty (normally,
the target page is allowed to passivate,
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
Mon Aug 18 15:47:44 2008
@@ -30,7 +30,7 @@
protected Link createLink(Object[] contextArray)
{
- return resources.createActionLink(EventConstants.ACTION, false,
contextArray);
+ return resources.createEventLink(EventConstants.ACTION, contextArray);
}
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
Mon Aug 18 15:47:44 2008
@@ -151,7 +151,7 @@
String idType = id.getClass().getName();
- Link link = resources.createActionLink("triggerRemoveRow", false,
id, idType);
+ Link link = resources.createEventLink("triggerRemoveRow", id,
idType);
String asURI = link.toAbsoluteURI();
@@ -414,7 +414,7 @@
Object value = encoder.toValue(coerced);
- resources.triggerEvent("removeRow", new Object[]{value}, null);
+ resources.triggerEvent("removeRow", new Object[] {value}, null);
return new JSONObject();
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
Mon Aug 18 15:47:44 2008
@@ -53,6 +53,6 @@
{
ComponentResources containerResources =
resources.getContainerResources();
- return containerResources.createActionLink(event, false, eventContext);
+ return containerResources.createEventLink(event, eventContext);
}
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
Mon Aug 18 15:47:44 2008
@@ -226,7 +226,7 @@
resources.triggerEvent(PREPARE, contextArray, null);
- Link link = resources.createActionLink(EventConstants.ACTION, true,
contextArray);
+ Link link = resources.createFormEventLink(EventConstants.ACTION,
contextArray);
// Save the form element for later, in case we want to write an
encoding type attribute.
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=686888&r1=686887&r2=686888&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 Aug 18 15:47:44 2008
@@ -129,8 +129,8 @@
// Now work on the JavaScript side of things.
- Link link = resources.createActionLink(INJECT_EVENT, false,
- context == null ? new Object[0]
: context.toArray());
+ Link link = resources.createEventLink(INJECT_EVENT,
+ context == null ? new Object[0]
: context.toArray());
link.addParameter(FORMID_PARAMETER, formSupport.getClientId());
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
Mon Aug 18 15:47:44 2008
@@ -137,10 +137,10 @@
}
Object[] context = zone == null
- ? new Object[] { pageIndex }
- : new Object[] { pageIndex, zone };
+ ? new Object[] {pageIndex}
+ : new Object[] {pageIndex, zone};
- Link link = resources.createActionLink(EventConstants.ACTION, false,
context);
+ Link link = resources.createEventLink(EventConstants.ACTION, context);
Element element = writer.element("a", "href", link, "title",
messages.format("goto-page", pageIndex));
@@ -174,7 +174,7 @@
{
onAction(newPage);
- resources.triggerEvent(InternalConstants.GRID_INPLACE_UPDATE, new
Object[] { zone }, null);
+ resources.triggerEvent(InternalConstants.GRID_INPLACE_UPDATE, new
Object[] {zone}, null);
return true; // abort event
}
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=686888&r1=686887&r2=686888&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 Aug 18 15:47:44 2008
@@ -140,7 +140,7 @@
"class", "t-autocomplete-menu");
writer.end();
- Link link = resources.createActionLink(EVENT_NAME, false);
+ Link link = resources.createEventLink(EVENT_NAME);
JSONObject config = new JSONObject();
@@ -188,7 +188,7 @@
}
};
- resources.triggerEvent("providecompletions", new Object[]{input},
callback);
+ resources.triggerEvent("providecompletions", new Object[] {input},
callback);
ContentType contentType = responseRenderer.findContentType(this);
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java
Mon Aug 18 15:47:44 2008
@@ -38,7 +38,7 @@
public void generateResponse(Page page) throws IOException
{
- Link link = linkFactory.createPageLink(page, false);
+ Link link = linkFactory.createPageRenderLink(page, false);
response.sendRedirect(link);
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
Mon Aug 18 15:47:44 2008
@@ -44,12 +44,12 @@
storage.postChange(pageName, componentId, fieldName, newValue);
}
- public void createdActionLink(Link link)
+ public void createComponentEventLink(Link link)
{
storage.updateLink(link);
}
- public void createdPageLink(Link link)
+ public void createdPageRenderLink(Link link)
{
storage.updateLink(link);
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
Mon Aug 18 15:47:44 2008
@@ -41,7 +41,8 @@
* isn't the concern of this code, since [EMAIL PROTECTED]
org.apache.tapestry5.services.Request#getPath()} will already have
* stripped that off. We can act as if the context is always "/" (the path
always starts with a slash).
*
- * @see
LinkFactory#createActionLink(org.apache.tapestry5.internal.structure.Page,
String, String,boolean, Object...)
+ * @see
LinkFactory#createComponentEventLink(org.apache.tapestry5.internal.structure.Page,
String, String,boolean,
+ * Object...)
*/
public class ComponentEventDispatcher implements Dispatcher
{
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java
Mon Aug 18 15:47:44 2008
@@ -36,7 +36,7 @@
* link
* @see org.apache.tapestry5.ComponentResources#createActionLink(String,
boolean, Object[])
*/
- Link createActionLink(Page page, String nestedId, String eventType,
boolean forForm, Object... context);
+ Link createComponentEventLink(Page page, String nestedId, String
eventType, boolean forForm, Object... context);
/**
* Creates a render link for the page. If an activation context is
supplied then that context is built into the URI.
@@ -53,11 +53,11 @@
* @return a link
* @see org.apache.tapestry5.ComponentResources#createPageLink(String,
boolean, Object[])
*/
- Link createPageLink(Page page, boolean override, Object...
activationContext);
+ Link createPageRenderLink(Page page, boolean override, Object...
activationContext);
/**
- * As with [EMAIL PROTECTED] #createPageLink(Page, boolean, Object[])},
but the page is specified by logical name, rather than
- * as an instance.
+ * As with [EMAIL PROTECTED] #createPageRenderLink(Page, boolean,
Object[])}, but the page is specified by logical name, rather
+ * than as an instance.
*
* @param logicalPageName the logical name of the page to generate a link
to
* @param override if true, then the provided activation context is
always used even if empty
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java
Mon Aug 18 15:47:44 2008
@@ -119,7 +119,8 @@
listeners.add(listener);
}
- public Link createActionLink(Page page, String nestedId, String eventType,
boolean forForm, Object... context)
+ public Link createComponentEventLink(Page page, String nestedId, String
eventType, boolean forForm,
+ Object... context)
{
notNull(page, "page");
notBlank(eventType, "action");
@@ -154,7 +155,7 @@
componentInvocationMap.store(link, invocation);
for (LinkFactoryListener listener : listeners)
- listener.createdActionLink(link);
+ listener.createComponentEventLink(link);
return link;
}
@@ -177,7 +178,7 @@
link.addParameter(InternalConstants.PAGE_CONTEXT_NAME,
builder.toString());
}
- public Link createPageLink(Page page, boolean override, Object...
activationContext)
+ public Link createPageRenderLink(Page page, boolean override, Object...
activationContext)
{
notNull(page, "page");
@@ -212,7 +213,7 @@
componentInvocationMap.store(link, invocation);
for (LinkFactoryListener listener : listeners)
- listener.createdPageLink(link);
+ listener.createdPageRenderLink(link);
return link;
}
@@ -272,6 +273,6 @@
// This verifies that the page name is valid.
Page page = pageCache.get(logicalPageName);
- return createPageLink(page, override, context);
+ return createPageRenderLink(page, override, context);
}
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java
Mon Aug 18 15:47:44 2008
@@ -27,7 +27,7 @@
*
* @param link the newly created link
*/
- void createdPageLink(Link link);
+ void createdPageRenderLink(Link link);
/**
* Invoked when an action link (a link that asks a component to perform an
action) is created. The listener may
@@ -35,5 +35,5 @@
*
* @param link the newly created link
*/
- void createdActionLink(Link link);
+ void createComponentEventLink(Link link);
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java
Mon Aug 18 15:47:44 2008
@@ -62,7 +62,7 @@
// Page is secure but request is not, so redirect.
- Link link = linkFactory.createPageLink(page, false);
+ Link link = linkFactory.createPageRenderLink(page, false);
response.sendRedirect(link);
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
Mon Aug 18 15:47:44 2008
@@ -119,19 +119,29 @@
}
/**
- * Delegates to the [EMAIL PROTECTED] Page#createActionLink(String,
String, boolean, Object[])} on the containing page. Uses
- * the element's nested id (i.e., a mixin can generate a link, but the
link targets the component, not the mixin
- * itself). Why the extra layer? Trying to avoid some unwanted injection
(of LinkFactory, into every component page
- * element).
+ * Delegates to the [EMAIL PROTECTED]
Page#createComponentEventLink(String, String, boolean, Object[])} on the
containing page.
+ * Uses the element's nested id (i.e., a mixin can generate a link, but
the link targets the component, not the
+ * mixin itself). Why the extra layer? Trying to avoid some unwanted
injection (of LinkFactory, into every component
+ * page element).
*/
- public Link createActionLink(String action, boolean forForm, Object...
context)
+ public Link createActionLink(String eventType, boolean forForm, Object...
context)
{
- return page.createActionLink(element.getNestedId(), action, forForm,
context);
+ return page.createComponentEventLink(element.getNestedId(), eventType,
forForm, context);
+ }
+
+ public Link createEventLink(String eventType, Object... context)
+ {
+ return page.createComponentEventLink(element.getNestedId(), eventType,
false, context);
+ }
+
+ public Link createFormEventLink(String eventType, Object... context)
+ {
+ return page.createComponentEventLink(element.getNestedId(), eventType,
true, context);
}
public Link createPageLink(String pageName, boolean override, Object...
context)
{
- return page.createPageLink(pageName, override, context);
+ return page.createPageRenderLink(pageName, override, context);
}
public void discardPersistentFieldChanges()
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
Mon Aug 18 15:47:44 2008
@@ -115,16 +115,16 @@
/**
* Creates a link that will trigger behavior in a component within the
page.
*
- * @see org.apache.tapestry5.ComponentResources#createActionLink(String,
boolean, Object[])
+ * @see org.apache.tapestry5.ComponentResources#createEventLink(String,
Object[])
*/
- Link createActionLink(String nestedId, String eventType, boolean forForm,
Object... context);
+ Link createComponentEventLink(String nestedId, String eventType, boolean
forForm, Object... context);
/**
* Creates a link to the named page.
*
* @see org.apache.tapestry5.ComponentResources#createPageLink(String,
boolean, Object[])
*/
- Link createPageLink(String pageName, boolean override, Object... context);
+ Link createPageRenderLink(String pageName, boolean override, Object...
context);
/**
* Posts a change to a persistent field.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
Mon Aug 18 15:47:44 2008
@@ -151,12 +151,12 @@
return rootElement.getLogger();
}
- public Link createActionLink(String nestedId, String eventType, boolean
forForm, Object... context)
+ public Link createComponentEventLink(String nestedId, String eventType,
boolean forForm, Object... context)
{
- return linkFactory.createActionLink(this, nestedId, eventType,
forForm, context);
+ return linkFactory.createComponentEventLink(this, nestedId, eventType,
forForm, context);
}
- public Link createPageLink(String pageName, boolean override, Object...
context)
+ public Link createPageRenderLink(String pageName, boolean override,
Object... context)
{
return linkFactory.createPageLink(pageName, override, context);
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
Mon Aug 18 15:47:44 2008
@@ -30,7 +30,7 @@
Object[]
onPassivate()
{
- return new Object[] { };
+ return new Object[] {};
}
public String getMessage()
@@ -47,6 +47,9 @@
public String getActionURL()
{
+ // This could be shifted to createEventLink(), but leaving it alone
verifys backwards
+ // compatibility to 5.0.14.
+
Link link = resources.createActionLink("UpdateMessage", false, "from
getActionURL()");
return link.toURI();
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
Mon Aug 18 15:47:44 2008
@@ -124,7 +124,7 @@
factory.addListener(listener);
- Link link = factory.createPageLink(page, false);
+ Link link = factory.createPageRenderLink(page, false);
assertEquals(link.toRedirectURI(), ENCODED);
@@ -176,7 +176,7 @@
factory.addListener(listener);
- Link link = factory.createPageLink(page, false);
+ Link link = factory.createPageRenderLink(page, false);
assertEquals(link.toRedirectURI(), ENCODED);
@@ -206,7 +206,7 @@
IAnswer<Void> createdPageLinkAnswer = newAnswerForCreatedLink(holder);
- listener.createdPageLink(isA(Link.class));
+ listener.createdPageRenderLink(isA(Link.class));
setAnswer(createdPageLinkAnswer);
train_getBaseURL(securityManager, page, null);
@@ -224,7 +224,7 @@
securityManager);
factory.addListener(listener);
- Link link = factory.createPageLink(page, false, "biff", "bazz");
+ Link link = factory.createPageRenderLink(page, false, "biff", "bazz");
assertEquals(link.toRedirectURI(), ENCODED);
@@ -254,7 +254,7 @@
IAnswer<Void> createdPageLinkAnswer = newAnswerForCreatedLink(holder);
- listener.createdPageLink(isA(Link.class));
+ listener.createdPageRenderLink(isA(Link.class));
setAnswer(createdPageLinkAnswer);
train_getBaseURL(securityManager, page, null);
@@ -271,7 +271,7 @@
securityManager);
factory.addListener(listener);
- Link link = factory.createPageLink(page, true);
+ Link link = factory.createPageRenderLink(page, true);
assertEquals(link.toRedirectURI(), ENCODED);
@@ -450,7 +450,7 @@
expect(rootElement.triggerEvent(eq(EventConstants.PASSIVATE),
(Object[]) isNull(),
isA(ComponentEventCallback.class))).andAnswer(triggerEventAnswer);
- listener.createdPageLink(isA(Link.class));
+ listener.createdPageRenderLink(isA(Link.class));
setAnswer(createdPageLinkAnswer);
}
@@ -468,7 +468,7 @@
expect(rootElement.triggerEvent(eq(EventConstants.PASSIVATE),
(Object[]) isNull(),
isA(ComponentEventCallback.class))).andAnswer(triggerEventAnswer);
- listener.createdActionLink(isA(Link.class));
+ listener.createComponentEventLink(isA(Link.class));
setAnswer(createdPageLinkAnswer);
}
@@ -497,7 +497,7 @@
ComponentEventCallback handler = (ComponentEventCallback)
EasyMock
.getCurrentArguments()[2];
- handler.handleResult(new Object[]{"foo", "bar"});
+ handler.handleResult(new Object[] {"foo", "bar"});
return true;
}
@@ -546,7 +546,7 @@
contextValueEncoder,
securityManager);
factory.addListener(listener);
- Link link = factory.createActionLink(page, null, "myaction", false,
"1.2.3", "4.5.6");
+ Link link = factory.createComponentEventLink(page, null, "myaction",
false, "1.2.3", "4.5.6");
assertEquals(link.toURI(), ENCODED);
assertSame(link, holder.get());
@@ -599,7 +599,7 @@
contextValueEncoder,
securityManager);
factory.addListener(listener);
- Link link = factory.createActionLink(containingPage, null, "myaction",
false);
+ Link link = factory.createComponentEventLink(containingPage, null,
"myaction", false);
assertEquals(link.toURI(), ENCODED);
assertSame(link, holder.get());
@@ -654,7 +654,7 @@
contextValueEncoder,
securityManager);
factory.addListener(listener);
- Link link = factory.createActionLink(page, nestedId, eventName, false,
context);
+ Link link = factory.createComponentEventLink(page, nestedId,
eventName, false, context);
assertEquals(link.toURI(), ENCODED);
assertSame(link, holder.get());
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
Mon Aug 18 15:47:44 2008
@@ -98,7 +98,7 @@
train_isSecure(locator, page, true);
- train_createPageLink(linkFactory, page, link);
+ train_createPageRenderLink(linkFactory, page, link);
response.sendRedirect(link);
@@ -116,10 +116,10 @@
public Object[][] base_URL_data()
{
return new Object[][] {
- { true, true, null },
- { false, false, null },
- { true, false, "http://example.org"; },
- { false, true, "https://example.org"; }
+ {true, true, null},
+ {false, false, null},
+ {true, false, "http://example.org"},
+ {false, true, "https://example.org"}
};
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java?rev=686888&r1=686887&r2=686888&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
Mon Aug 18 15:47:44 2008
@@ -442,9 +442,9 @@
return newMock(LinkFactory.class);
}
- protected final void train_createPageLink(LinkFactory factory, Page page,
Link link)
+ protected final void train_createPageRenderLink(LinkFactory factory, Page
page, Link link)
{
- expect(factory.createPageLink(page, false)).andReturn(link);
+ expect(factory.createPageRenderLink(page, false)).andReturn(link);
}
protected final void train_isLoaded(InternalComponentResources resources,
boolean isLoaded)
