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 2015/06/24 14:58:56 UTC
[50/50] [abbrv] wicket git commit: Merge branch 'master' into
pr-114-master
Merge branch 'master' into pr-114-master
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3e63e97c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3e63e97c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3e63e97c
Branch: refs/heads/master
Commit: 3e63e97c59ed5130797f53584acd4015bf675a9c
Parents: 0b79e56 d346cc3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 24 15:57:05 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 24 15:57:05 2015 +0300
----------------------------------------------------------------------
.../wicket/markup/html/image/InlineImage.java | 2 +-
.../request/resource/PackageResource.java | 7 ++--
.../resource/PackageResourceReference.java | 8 ++--
.../apache/wicket/resource/ResourceUtil.java | 24 ++++++------
.../wicket/resource/ResourceUtilTest.java | 39 ++++++++++----------
.../main/webapp/META-INF/velocity.properties | 7 ++--
.../org/apache/wicket/util/string/Strings.java | 6 +--
7 files changed, 47 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e63e97c/wicket-core/src/main/java/org/apache/wicket/markup/html/image/InlineImage.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/markup/html/image/InlineImage.java
index a10ec44,15ae5b4..d871b9b
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/InlineImage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/InlineImage.java
@@@ -28,10 -28,10 +28,10 @@@ import org.apache.wicket.util.resource.
/**
* The inline image is used to embed the complete image content within a HTML document.
- *
+ *
* @author Tobias Soloschenko
* @since 6.20.0
- *
+ *
*/
public class InlineImage extends WebComponent
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e63e97c/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
index 081c9a6,c5ade25..b2bbb0f
--- 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
@@@ -431,7 -431,7 +431,8 @@@ public class PackageResource extends Ab
/**
- * Locate resource stream for current resource. Be aware that method takes the current wicket session's
++
+ * Locate resource stream for current resource. Be aware that method takes the current wicket session's
* locale and style into account when locating the stream.
*
* @return resource stream or <code>null</code> if not found
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e63e97c/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
index 907e660,b60541e..8197ed6
--- 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
@@@ -236,10 -236,10 +236,10 @@@ public class PackageResourceReference e
{
return Session.get().getStyle();
}
-
+
return style;
}
-
+
private String getCurrentVariation(UrlAttributes attributes)
{
final String variation = getVariation();
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e63e97c/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
----------------------------------------------------------------------
diff --cc wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
index 0f41ccc,6c4458c..3f4ff08
--- a/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java
@@@ -38,8 -38,8 +38,8 @@@ import org.apache.wicket.util.string.St
public class ResourceUtil
{
/**
- * Reads resource reference attributes (style, locale, variation) encoded in the given string.
+ * Reads resource reference attributes (style, locale, variation) encoded in the given string.
- *
+ *
* @param encodedAttributes
* the string containing the resource attributes
* @return the encoded attributes
@@@ -137,10 -137,10 +137,10 @@@
return res.toString();
}
}
-
+
/**
* Encodes the attributes of the given resource reference in the specified url.
- *
+ *
* @param url
* the resource reference attributes to encode
* @param reference
@@@ -173,10 -173,10 +173,10 @@@
CharSequence tmp = Strings.replaceAll(attribute, "~", "~~");
return Strings.replaceAll(tmp, "-", "~");
}
-
+
/**
* Parses the string representation of a {@link java.util.Locale} (for example 'en_GB').
- *
+ *
* @param locale
* the string representation of a {@link java.util.Locale}
* @return the corresponding {@link java.util.Locale} instance
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e63e97c/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
----------------------------------------------------------------------
diff --cc wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
index 3cfa584,e234195..7ce3980
--- a/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/ResourceUtilTest.java
@@@ -86,52 -86,52 +86,51 @@@ public class ResourceUtilTest extends A
{
UrlAttributes attributes = new UrlAttributes(null, null, null);
assertNull(ResourceUtil.encodeResourceReferenceAttributes(attributes));
-
+
attributes = new UrlAttributes(Locale.CANADA_FRENCH, "style", "variation");
-
+
assertEquals("fr_CA-style-variation", ResourceUtil.encodeResourceReferenceAttributes(attributes));
-
+
attributes = new UrlAttributes(null, null, "variation");
-
+
assertEquals("--variation", ResourceUtil.encodeResourceReferenceAttributes(attributes));
}
-
+
@Test
public void encodeResourceReferenceAttributesWithResource() throws Exception
{
ResourceReference resourceReference = Mockito.mock(ResourceReference.class);
-
+
//test with all null attributes
UrlAttributes attributes = new UrlAttributes(null, null, null);
-
+
String urlString = "www.funny.url";
Url url = Url.parse(urlString);
-
+
Mockito.when(resourceReference.getUrlAttributes()).thenReturn(attributes);
ResourceUtil.encodeResourceReferenceAttributes(url, resourceReference);
-
+
assertEquals(urlString, url.toString());
-
+
Mockito.reset(resourceReference);
-
+
//test with locale, style and variation
attributes = new UrlAttributes(Locale.CANADA_FRENCH, "style", "variation");
-
+
Mockito.when(resourceReference.getUrlAttributes()).thenReturn(attributes);
ResourceUtil.encodeResourceReferenceAttributes(url, resourceReference);
-
+
assertEquals(urlString + "?fr_CA-style-variation", url.toString());
-
+
Mockito.reset(resourceReference);
-
+
//test with just variation
attributes = new UrlAttributes(null, null, "variation");
url = Url.parse(urlString);
-
+
Mockito.when(resourceReference.getUrlAttributes()).thenReturn(attributes);
ResourceUtil.encodeResourceReferenceAttributes(url, resourceReference);
-
+
assertEquals(urlString + "?--variation", url.toString());
-
-
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3e63e97c/wicket-examples/src/main/webapp/META-INF/velocity.properties
----------------------------------------------------------------------
diff --cc wicket-examples/src/main/webapp/META-INF/velocity.properties
index acef282,1adfee6..4deb3c8
--- a/wicket-examples/src/main/webapp/META-INF/velocity.properties
+++ b/wicket-examples/src/main/webapp/META-INF/velocity.properties
@@@ -21,7 -21,7 +21,8 @@@
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
- # R U N T I M E L O G
++
+ # R U N T I M E L O G
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------