Repository: tapestry-5 Updated Branches: refs/heads/master 2cc30a6bd -> ff08ad572
Remove createActionLink() method, deprecated in 2008 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/4a74819f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/4a74819f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/4a74819f Branch: refs/heads/master Commit: 4a74819f31434d6f37e065318fc5fa7efe34d034 Parents: 2cc30a6 Author: Howard M. Lewis Ship <hls...@apache.org> Authored: Mon Dec 29 08:19:18 2014 -0800 Committer: Howard M. Lewis Ship <hls...@apache.org> Committed: Mon Dec 29 08:19:18 2014 -0800 ---------------------------------------------------------------------- .../tapestry5/ComponentResourcesCommon.java | 23 -------------------- .../tapestry5/internal/services/LinkSource.java | 4 +--- .../structure/ComponentPageElementImpl.java | 7 ------ .../InternalComponentResourcesImpl.java | 6 ----- .../app1/pages/ActionViaLinkDemo.java | 7 +----- 5 files changed, 2 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a74819f/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java index c15e254..e60597a 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java @@ -1,5 +1,3 @@ -// Copyright 2006-2013 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 @@ -196,27 +194,6 @@ public interface ComponentResourcesCommon extends Locatable * the page name and nested component id) will be encoded into a URL. A request for the URL will * {@linkplain #triggerEvent(String, Object[], org.apache.tapestry5.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 forForm - * if true, the link will be used as the eventType for an HTML form submission, which may affect - * what information is encoded into the link - * @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 {@link #createEventLink(String, Object[])} instead - */ - Link createActionLink(String eventType, boolean forForm, 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 - * {@linkplain #triggerEvent(String, Object[], org.apache.tapestry5.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. * http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a74819f/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java index d2868e5..c967c06 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java @@ -1,5 +1,3 @@ -// Copyright 2009, 2010, 2011 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 @@ -44,7 +42,7 @@ public interface LinkSource * @param context * Additional path data, each value will be converted to a string and appended to the URI @return a * link - * @see org.apache.tapestry5.ComponentResources#createActionLink(String, boolean, Object[]) + * @see org.apache.tapestry5.ComponentResources#createEventLink(String, Object...) */ Link createComponentEventLink(Page page, String nestedId, String eventType, boolean forForm, Object... context); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a74819f/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java index abd0258..92988d6 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java @@ -1,5 +1,3 @@ -// Copyright 2006-2014 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 @@ -1243,11 +1241,6 @@ public class ComponentPageElementImpl extends BaseLocatable implements Component return elementResources.createComponentEventLink(coreResources, eventType, false, context); } - public Link createActionLink(String eventType, boolean forForm, Object... context) - { - return elementResources.createComponentEventLink(coreResources, eventType, forForm, context); - } - public Link createFormEventLink(String eventType, Object... context) { return elementResources.createComponentEventLink(coreResources, eventType, true, context); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a74819f/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java index 5d0ac16..9f4aff1 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java @@ -1,5 +1,3 @@ -// Copyright 2006-2012 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 @@ -208,10 +206,6 @@ public class InternalComponentResourcesImpl extends LockSupport implements Inter return element.createEventLink(eventType, context); } - public Link createActionLink(String eventType, boolean forForm, Object... context) - { - return element.createActionLink(eventType, forForm, context); - } public Link createFormEventLink(String eventType, Object... context) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4a74819f/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java index a8033e7..dbafd37 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java @@ -1,5 +1,3 @@ -// Copyright 2008, 2009 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 @@ -48,10 +46,7 @@ public class ActionViaLinkDemo 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()"); + Link link = resources.createEventLink("UpdateMessage", false, "from getActionURL()"); return link.toURI(); }
