Updated Branches: refs/heads/master 407902720 -> b73a9e576
Fully qualify the access to static inner classes from ResourceReference. For some reason my IDE started complaining about non-visible class and wasn't able to compile. The change makes the code a bit easy to read too. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9776b5b6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9776b5b6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9776b5b6 Branch: refs/heads/master Commit: 9776b5b6aea791aaa0c564144a667644188b109e Parents: 4079027 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Jul 9 10:42:52 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Jul 9 10:51:44 2012 +0300 ---------------------------------------------------------------------- .../request/resource/PackageResourceReference.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9776b5b6/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java index 6becc8e..ea3f92e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java @@ -62,7 +62,7 @@ public class PackageResourceReference extends ResourceReference * * @param key */ - public PackageResourceReference(final Key key) + public PackageResourceReference(final ResourceReference.Key key) { super(key); } @@ -138,7 +138,7 @@ public class PackageResourceReference extends ResourceReference return resource; } - private UrlAttributes getUrlAttributes(Locale locale, String style, String variation) + private ResourceReference.UrlAttributes getUrlAttributes(Locale locale, String style, String variation) { IResourceStreamLocator locator = Application.get() .getResourceSettings() @@ -150,9 +150,9 @@ public class PackageResourceReference extends ResourceReference null, false); if (stream == null) - return new UrlAttributes(null, null, null); + return new ResourceReference.UrlAttributes(null, null, null); - return new UrlAttributes(stream.getLocale(), stream.getStyle(), stream.getVariation()); + return new ResourceReference.UrlAttributes(stream.getLocale(), stream.getStyle(), stream.getVariation()); } private Locale getCurrentLocale() @@ -243,19 +243,19 @@ public class PackageResourceReference extends ResourceReference } @Override - public UrlAttributes getUrlAttributes() + public ResourceReference.UrlAttributes getUrlAttributes() { Locale locale = getCurrentLocale(); String style = getCurrentStyle(); String variation = getVariation(); - UrlAttributes key = new UrlAttributes(locale, style, variation); + ResourceReference.UrlAttributes key = new ResourceReference.UrlAttributes(locale, style, variation); if (urlAttributesCacheMap == null) { urlAttributesCacheMap = Generics.newConcurrentHashMap(); } - UrlAttributes value = urlAttributesCacheMap.get(key); + ResourceReference.UrlAttributes value = urlAttributesCacheMap.get(key); if (value == null) { value = getUrlAttributes(locale, style, variation);
