Repository: wicket Updated Branches: refs/heads/master 11e969a03 -> e8cb8efa5
Extract some local variables for easier reading and debugging. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8113b6da Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8113b6da Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8113b6da Branch: refs/heads/master Commit: 8113b6da2a132867f1ed4512278541fccbb59e3e Parents: 11e969a Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Jun 20 15:49:53 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Jun 20 15:49:53 2015 +0300 ---------------------------------------------------------------------- .../resource/PackageResourceReference.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8113b6da/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 ef49fc0..b60541e 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 @@ -126,22 +126,28 @@ public class PackageResourceReference extends ResourceReference final Url url = RequestCycle.get().getRequest().getUrl(); //resource attributes (locale, style, variation) might be encoded in the URL final UrlAttributes urlAttributes = ResourceUtil.decodeResourceReferenceAttributes(url); + final String currentVariation = getCurrentVariation(urlAttributes); + final String currentStyle = getCurrentStyle(urlAttributes); + final Locale currentLocale = getCurrentLocale(urlAttributes); + final Class<?> scope = getScope(); + final String name = getName(); if (CSS_EXTENSION.equals(extension)) { - resource = new CssPackageResource(getScope(), getName(), getCurrentLocale(urlAttributes), - getCurrentStyle(urlAttributes), getCurrentVariation(urlAttributes)).readBuffered(readBuffered); + resource = new CssPackageResource(scope, name, currentLocale, + currentStyle, currentVariation); } else if (JAVASCRIPT_EXTENSION.equals(extension)) { - resource = new JavaScriptPackageResource(getScope(), getName(), getCurrentLocale(urlAttributes), - getCurrentStyle(urlAttributes), getCurrentVariation(urlAttributes)).readBuffered(readBuffered); + resource = new JavaScriptPackageResource(scope, name, currentLocale, + currentStyle, currentVariation); } else { - resource = new PackageResource(getScope(), getName(), getCurrentLocale(urlAttributes), - getCurrentStyle(urlAttributes), getCurrentVariation(urlAttributes)).readBuffered(readBuffered); + resource = new PackageResource(scope, name, currentLocale, + currentStyle, currentVariation); } + resource.readBuffered(readBuffered); removeCompressFlagIfUnnecessary(resource);
