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/03 01:37:06 UTC
svn commit: r950824 - in
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5:
internal/services/linktransform/ services/ services/linktransform/
Author: hlship
Date: Wed Jun 2 23:37:06 2010
New Revision: 950824
URL: http://svn.apache.org/viewvc?rev=950824&view=rev
Log:
TAP5-1042: Remove AssetLinkTransformer as asset URL construction doesn't actually use Link
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/AssetLinkTransformer.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/LinkTransformer.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java?rev=950824&r1=950823&r2=950824&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/linktransform/LinkTransformerImpl.java Wed Jun 2 23:37:06 2010
@@ -14,39 +14,28 @@
package org.apache.tapestry5.internal.services.linktransform;
-import org.apache.tapestry5.Asset;
import org.apache.tapestry5.Link;
import org.apache.tapestry5.ioc.annotations.Primary;
import org.apache.tapestry5.services.ComponentEventRequestParameters;
import org.apache.tapestry5.services.PageRenderRequestParameters;
-import org.apache.tapestry5.services.linktransform.AssetLinkTransformer;
import org.apache.tapestry5.services.linktransform.ComponentEventLinkTransformer;
import org.apache.tapestry5.services.linktransform.LinkTransformer;
import org.apache.tapestry5.services.linktransform.PageRenderLinkTransformer;
public class LinkTransformerImpl implements LinkTransformer
{
- private final AssetLinkTransformer assetLinkTransformer;
-
private final ComponentEventLinkTransformer componentEventLinkTransformer;
private final PageRenderLinkTransformer pageRenderLinkTransformer;
public LinkTransformerImpl(@Primary
- AssetLinkTransformer assetLinkTransformer, @Primary
ComponentEventLinkTransformer componentEventLinkTransformer, @Primary
PageRenderLinkTransformer pageRenderLinkTransformer)
{
- this.assetLinkTransformer = assetLinkTransformer;
this.componentEventLinkTransformer = componentEventLinkTransformer;
this.pageRenderLinkTransformer = pageRenderLinkTransformer;
}
- public Link transformAssetLink(Link defaultLink, Asset asset, String assetPath)
- {
- return or(assetLinkTransformer.transformAssetLink(defaultLink, asset, assetPath), defaultLink);
- }
-
public Link transformComponentEventLink(Link defaultLink, ComponentEventRequestParameters parameters)
{
return or(componentEventLinkTransformer.transformComponentEventLink(defaultLink, parameters), defaultLink);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=950824&r1=950823&r2=950824&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Wed Jun 2 23:37:06 2010
@@ -117,7 +117,6 @@ import org.apache.tapestry5.services.jav
import org.apache.tapestry5.services.javascript.JavascriptStackSource;
import org.apache.tapestry5.services.javascript.JavascriptSupport;
import org.apache.tapestry5.services.javascript.StylesheetLink;
-import org.apache.tapestry5.services.linktransform.AssetLinkTransformer;
import org.apache.tapestry5.services.linktransform.ComponentEventLinkTransformer;
import org.apache.tapestry5.services.linktransform.LinkTransformer;
import org.apache.tapestry5.services.linktransform.PageRenderLinkTransformer;
@@ -2950,17 +2949,6 @@ public final class TapestryModule
}
/**
- * Builds {@link AssetLinkTransformer} service as a chain of command.
- *
- * @since 5.2.0
- */
- @Marker(Primary.class)
- public AssetLinkTransformer buildAssetLinkTransformer(List<AssetLinkTransformer> configuration)
- {
- return chainBuilder.build(AssetLinkTransformer.class, configuration);
- }
-
- /**
* Builds {@link ComponentEventLinkTransformer} service as a chain of command.
*
* @since 5.2.0
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/LinkTransformer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/LinkTransformer.java?rev=950824&r1=950823&r2=950824&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/LinkTransformer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/linktransform/LinkTransformer.java Wed Jun 2 23:37:06 2010
@@ -15,12 +15,11 @@
package org.apache.tapestry5.services.linktransform;
/**
- * A facade around {@link AssetLinkTransformer}, {@link ComponentEventLinkTransformer} and
- * {@link PageRenderLinkTransformer}.
+ * A facade around {@link ComponentEventLinkTransformer} and {@link PageRenderLinkTransformer}.
*
* @since 5.2.0
*/
-public interface LinkTransformer extends AssetLinkTransformer, ComponentEventLinkTransformer, PageRenderLinkTransformer
+public interface LinkTransformer extends ComponentEventLinkTransformer, PageRenderLinkTransformer
{
}