Repository: wicket Updated Branches: refs/heads/wicket-6.x 1a6f1bde1 -> 1a4844f5c
WICKET-5827 bugfixes Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c92ad134 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c92ad134 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c92ad134 Branch: refs/heads/wicket-6.x Commit: c92ad1348eec047453e0980f01d5a1713927b69f Parents: 1a6f1bd Author: klopfdreh <[email protected]> Authored: Mon Feb 16 12:19:21 2015 +0100 Committer: klopfdreh <[email protected]> Committed: Mon Feb 16 12:19:21 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/resource/CompositeCssCompressor.java | 4 ++-- .../src/main/java/org/apache/wicket/resource/CssUrlReplacer.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c92ad134/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java index d8fdcc0..6e7b1c3 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/CompositeCssCompressor.java @@ -42,7 +42,7 @@ import org.apache.wicket.css.ICssCompressor; * @author Tobias Soloschenko * */ -public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor +public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor, ICssCompressor { /* Compressors to compress the CSS content */ private final List<ICssCompressor> compressors = new ArrayList<ICssCompressor>(); @@ -71,7 +71,7 @@ public class CompositeCssCompressor implements IScopeAwareTextResourceProcessor if (compressor instanceof IScopeAwareTextResourceProcessor) { IScopeAwareTextResourceProcessor processor = (IScopeAwareTextResourceProcessor)compressor; - processor.process(compressed, scope, name); + compressed = processor.process(compressed, scope, name); } else { http://git-wip-us.apache.org/repos/asf/wicket/blob/c92ad134/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java b/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java index 6ad891c..7734e91 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/CssUrlReplacer.java @@ -19,6 +19,7 @@ package org.apache.wicket.resource; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.wicket.css.ICssCompressor; import org.apache.wicket.request.Url; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.resource.PackageResourceReference; @@ -37,7 +38,7 @@ import org.apache.wicket.request.resource.PackageResourceReference; * @since 6.20.0 * @author Tobias Soloschenko */ -public class CssUrlReplacer implements IScopeAwareTextResourceProcessor +public class CssUrlReplacer implements IScopeAwareTextResourceProcessor, ICssCompressor { // The pattern to find URLs in CSS resources private static final Pattern URL_PATTERN = Pattern.compile("url\\(['|\"]*(.*?)['|\"]*\\)");
