Repository: wicket Updated Branches: refs/heads/WICKET-5909 [created] eced7b963
WICKET-5909 Session style is not taken into account when loading mounted resources. Use the current session style and locale if there are no explicitly specified ones in PackageResource's constructor. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eced7b96 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eced7b96 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eced7b96 Branch: refs/heads/WICKET-5909 Commit: eced7b96301436de388e8f7ee7af6d366544b905 Parents: eff2b25 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri May 22 22:59:40 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri May 22 22:59:40 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/wicket/request/resource/PackageResource.java | 4 +++- .../src/test/java/org/apache/wicket/markup/html/packaged1_en.txt | 2 +- .../java/org/apache/wicket/markup/html/packaged1_foo_bar.txt | 2 +- .../apache/wicket/request/resource/CssPackageResourceTest.java | 2 +- .../wicket/request/resource/JavaScriptPackageResourceTest.java | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/eced7b96/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java index 30ebfc4..4bd50d4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java @@ -416,7 +416,9 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl */ public IResourceStream getResourceStream() { - return internalGetResourceStream(style, locale); + String _style = style != null ? style : getCurrentStyle(); + Locale _locale = locale != null ? locale : getCurrentLocale(); + return internalGetResourceStream(_style, _locale); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/eced7b96/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_en.txt ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_en.txt b/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_en.txt index 34997f7..cd335b2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_en.txt +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_en.txt @@ -1 +1 @@ -TEST +TEST EN \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/eced7b96/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_foo_bar.txt ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_foo_bar.txt b/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_foo_bar.txt index 34997f7..da441b1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_foo_bar.txt +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/packaged1_foo_bar.txt @@ -1 +1 @@ -TEST +TEST EN foo bar \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/eced7b96/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java index 06a6f44..7b57ae5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java @@ -111,6 +111,6 @@ public class CssPackageResourceTest extends WicketTestCase tester.getApplication().getResourceSettings().setCssCompressor(null); tester.startResource(resource); - assertEquals("TEST", tester.getLastResponseAsString()); + assertEquals("TEST EN", tester.getLastResponseAsString()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/eced7b96/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java index 39fd9c6..140463b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java @@ -152,6 +152,6 @@ public class JavaScriptPackageResourceTest extends WicketTestCase tester.getApplication().getResourceSettings().setJavaScriptCompressor(null); tester.startResource(resource); - assertEquals("TEST", tester.getLastResponseAsString()); + assertEquals("TEST EN", tester.getLastResponseAsString()); } }
