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 2013/06/26 11:42:14 UTC
[2/2] git commit: Fix indenting - use tabs
Fix indenting - use tabs
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b2427ddb
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b2427ddb
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b2427ddb
Branch: refs/heads/wicket-6.x
Commit: b2427ddb1dd7db1b5426a39a1b8ac97ed902c7d4
Parents: 9eacfef
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 26 12:40:18 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 26 12:40:48 2013 +0300
----------------------------------------------------------------------
.../resource/PackageResourceReference.java | 16 ++++-----
.../resource/PackageResourceReferenceTest.java | 38 ++++++++++----------
2 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b2427ddb/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 710eef2..ca248a0 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
@@ -207,14 +207,14 @@ public class PackageResourceReference extends ResourceReference
if (idxOfExtension > -1)
{
String extension = name.substring(idxOfExtension);
- final String baseName = name.substring(0, name.length() - extension.length() + 1);
- if (!".min".equals(extension) && !baseName.endsWith(".min."))
- {
- minifiedName = baseName + "min" + extension;
- } else
- {
- minifiedName = name;
- }
+ final String baseName = name.substring(0, name.length() - extension.length() + 1);
+ if (!".min".equals(extension) && !baseName.endsWith(".min."))
+ {
+ minifiedName = baseName + "min" + extension;
+ } else
+ {
+ minifiedName = name;
+ }
} else
{
minifiedName = name + ".min";
http://git-wip-us.apache.org/repos/asf/wicket/blob/b2427ddb/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
index 63cb6ec..5fe8474 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
@@ -185,23 +185,23 @@ public class PackageResourceReferenceTest extends WicketTestCase
}
}
- /**
- * see WICKET-5251 : Proper detection of already minified resources
- */
- @Test
- public void testMinifiedNameDetectMinInName() throws Exception
- {
- final PackageResourceReference html5minjs = new PackageResourceReference("html5.min.js");
- Assert.assertEquals("html5.min.js", html5minjs.getMinifiedName());
-
- final PackageResourceReference html5notminjs = new PackageResourceReference("html5.notmin.js");
- Assert.assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName());
-
- final PackageResourceReference html5notmin = new PackageResourceReference("html5notmin");
- Assert.assertEquals("html5notmin.min", html5notmin.getMinifiedName());
-
- final PackageResourceReference html5min = new PackageResourceReference("html5.min");
- Assert.assertEquals("html5.min", html5min.getMinifiedName());
-
- }
+ /**
+ * see WICKET-5251 : Proper detection of already minified resources
+ */
+ @Test
+ public void testMinifiedNameDetectMinInName() throws Exception
+ {
+ final PackageResourceReference html5minjs = new PackageResourceReference("html5.min.js");
+ Assert.assertEquals("html5.min.js", html5minjs.getMinifiedName());
+
+ final PackageResourceReference html5notminjs = new PackageResourceReference("html5.notmin.js");
+ Assert.assertEquals("html5.notmin.min.js", html5notminjs.getMinifiedName());
+
+ final PackageResourceReference html5notmin = new PackageResourceReference("html5notmin");
+ Assert.assertEquals("html5notmin.min", html5notmin.getMinifiedName());
+
+ final PackageResourceReference html5min = new PackageResourceReference("html5.min");
+ Assert.assertEquals("html5.min", html5min.getMinifiedName());
+
+ }
}