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 2014/06/04 21:28:47 UTC
[2/2] git commit: Update ResourceStreamLocator's javadoc to use the
resource reference variation too
Update ResourceStreamLocator's javadoc to use the resource reference variation too
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/00cea806
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/00cea806
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/00cea806
Branch: refs/heads/wicket-6.x
Commit: 00cea80653667573128a724e07c4fc1342d1d10a
Parents: b387462
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 2 09:42:51 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 4 19:45:19 2014 +0200
----------------------------------------------------------------------
.../resource/locator/ResourceStreamLocator.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/00cea806/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
index 282ac6a..7db4f67 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
@@ -38,18 +38,20 @@ import org.slf4j.LoggerFactory;
/**
- * Locate Wicket resource.
+ * Locates Wicket resources.
+ *
* <p>
- * Contains the logic to locate a resource based on a path, a style (see
+ * Contains the logic to locate a resource based on a path, a variation, a style (see
* {@link org.apache.wicket.Session}), a locale and an extension string. The full filename will be
- * built like: <path>_<style>_<locale>.<extension>.
+ * built like: <path>_<variation>_<style>_<locale>.<extension>.
* <p>
* Resource matches will be attempted in the following order:
* <ol>
- * <li>1. <path>_<style>_<locale>.<extension></li>
- * <li>2. <path>_<locale>.<extension></li>
- * <li>3. <path>_<style>.<extension></li>
- * <li>4. <path>.<extension></li>
+ * <li><path>_<variation>_<style>_<locale>.<extension></li>
+ * <li><path>_<style>_<locale>.<extension></li>
+ * <li><path>_<locale>.<extension></li>
+ * <li><path>_<style>.<extension></li>
+ * <li><path>.<extension></li>
* </ol>
* <p>
* Locales may contain a language, a country and a region or variant. Combinations of these