You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/02/12 22:07:06 UTC
[08/18] wicket git commit: Not limit it on pages
Not limit it on pages
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b96c404f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b96c404f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b96c404f
Branch: refs/heads/master
Commit: b96c404fb2760b4dd600d33c1f89972a06edc0be
Parents: 71648ab
Author: klopfdreh <kl...@tobiass-mbp>
Authored: Wed Feb 4 19:01:46 2015 +0100
Committer: klopfdreh <kl...@tobiass-mbp>
Committed: Wed Feb 4 19:01:46 2015 +0100
----------------------------------------------------------------------
.../apache/wicket/resource/CssUrlReplacer.java | 28 +++++++++-----------
1 file changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b96c404f/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 c0f1444..b9b8468 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
@@ -26,7 +26,6 @@ import java.util.regex.Pattern;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
-import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.application.IComponentInitializationListener;
import org.apache.wicket.core.util.lang.WicketObjects;
@@ -36,7 +35,7 @@ import org.apache.wicket.request.resource.PackageResourceReference;
/**
* This compressor is used to replace url within css files with resources that belongs to their
- * corresponding page classes. The compress method is not compressing any content, but replacing the
+ * corresponding component classes. The compress method is not compressing any content, but replacing the
* URLs with Wicket representatives.<br>
* <br>
* Usage:
@@ -52,8 +51,8 @@ import org.apache.wicket.request.resource.PackageResourceReference;
public class CssUrlReplacer implements ICssCompressor
{
- // Holds the names of pages
- private final Map<String, String> pageNames = Collections.synchronizedMap(new LinkedHashMap<String, String>());
+ // Holds the names of components
+ private final Map<String, String> componentNames = Collections.synchronizedMap(new LinkedHashMap<String, String>());
// The pattern to find URLs in CSS resources
private static final Pattern urlPattern = Pattern.compile("url\\(['|\"](.*)['|\"]\\)");
@@ -61,7 +60,7 @@ public class CssUrlReplacer implements ICssCompressor
public CssUrlReplacer(Application application)
{
- // Create an instantiation listener which filters only pages.
+ // Create an instantiation listener to detect components
application.getComponentInitializationListeners().add(
new IComponentInitializationListener()
{
@@ -69,11 +68,8 @@ public class CssUrlReplacer implements ICssCompressor
@Override
public void onInitialize(Component component)
{
- if (Page.class.isAssignableFrom(component.getClass()))
- {
- CssUrlReplacer.this.pageNames.put(component.getClass().getName(),
- component.getClass().getSimpleName());
- }
+ CssUrlReplacer.this.componentNames.put(component.getClass().getName(),
+ component.getClass().getSimpleName());
}
});
}
@@ -88,21 +84,21 @@ public class CssUrlReplacer implements ICssCompressor
// Search for urls
while (matcher.find())
{
- Collection<String> pageNames = this.pageNames.keySet();
- for (String pageName : pageNames)
+ Collection<String> componentNames = this.componentNames.keySet();
+ for (String componentName : componentNames)
{
try
{
- Class<Page> pageClass = WicketObjects.resolveClass(pageName);
+ Class<?> componentClass = WicketObjects.resolveClass(componentName);
String url = matcher.group(1);
if (!url.contains("/"))
{
- URL urlResource = pageClass.getResource(url);
- // If the resource is not found for a page skip it
+ URL urlResource = componentClass.getResource(url);
+ // If the resource is not found skip it
if (urlResource != null)
{
PackageResourceReference packageResourceReference = new PackageResourceReference(
- pageClass, url);
+ componentClass, url);
String replacedUrl = RequestCycle.get()
.urlFor(packageResourceReference, null)
.toString();