Updated Branches: refs/heads/master fdf8fade3 -> a4a725b58
WICKET-4422 Minimize Wicket's Ajax JavaScript files at build time Improve the logic to create the minifiedName when the original resource name has no extension. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a4a725b5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a4a725b5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a4a725b5 Branch: refs/heads/master Commit: a4a725b580ea135f1fc4b8709834d087c825c9e1 Parents: fdf8fad Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Feb 22 10:14:34 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Feb 22 10:14:34 2012 +0100 ---------------------------------------------------------------------- .../request/resource/PackageResourceReference.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a4a725b5/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 1cc63c1..3c6844a 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 @@ -185,8 +185,17 @@ public class PackageResourceReference extends ResourceReference private String getMinifiedName() { String name = super.getName(); - String extension = name.substring(name.lastIndexOf('.')); - return name.substring(0, name.length() - extension.length() + 1) + "min" + extension; + String minifiedName; + int idxOfExtension = name.lastIndexOf('.'); + if (idxOfExtension > -1) + { + String extension = name.substring(idxOfExtension); + minifiedName = name.substring(0, name.length() - extension.length() + 1) + "min" + extension; + } else + { + minifiedName = name + ".min"; + } + return minifiedName; } /**
