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 2012/01/18 13:13:20 UTC
[1/2] git commit: Minor improvements in javadoc and signatures.
Updated Branches:
refs/heads/master 2bb3e64c1 -> dfc8b9fcf
Minor improvements in javadoc and signatures.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dfc8b9fc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dfc8b9fc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dfc8b9fc
Branch: refs/heads/master
Commit: dfc8b9fcf2640c1529d5f7b0b8e7ee92ba6ffa8b
Parents: 8cded3a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jan 18 13:13:15 2012 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jan 18 13:13:15 2012 +0100
----------------------------------------------------------------------
.../wicket/request/resource/ClassScanner.java | 2 +-
.../resource/ResourceReferenceRegistry.java | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfc8b9fc/wicket-core/src/main/java/org/apache/wicket/request/resource/ClassScanner.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ClassScanner.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ClassScanner.java
index cacc83b..b2ff906 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ClassScanner.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ClassScanner.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
abstract class ClassScanner
{
- private static Logger log = LoggerFactory.getLogger(ClassScanner.class);
+ private static final Logger log = LoggerFactory.getLogger(ClassScanner.class);
private final Set<String> scannedClasses = new ConcurrentHashSet<String>();
http://git-wip-us.apache.org/repos/asf/wicket/blob/dfc8b9fc/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java
index 5904a42..0660348 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReferenceRegistry.java
@@ -82,6 +82,7 @@ public class ResourceReferenceRegistry
* reference will not be registered.
*
* @param reference
+ * the reference to register
* @return True, if the resource was registered successfully or has been registered previously
* already.
*/
@@ -97,10 +98,11 @@ public class ResourceReferenceRegistry
* reference will not be registered.
*
* @param reference
+ * the reference to register
* @return True, if the resource was registered successfully or has been registered previously
* already.
*/
- private final Key _registerResourceReference(final ResourceReference reference)
+ private Key _registerResourceReference(final ResourceReference reference)
{
Args.notNull(reference, "reference");
@@ -244,7 +246,7 @@ public class ResourceReferenceRegistry
* If true, "weaker" combination of scope, name, locale etc. are not tested
* @return Either the resource reference found in the registry or null if not found
*/
- private final ResourceReference _getResourceReference(final String scope, final String name,
+ private ResourceReference _getResourceReference(final String scope, final String name,
final Locale locale, final String style, final String variation, final boolean strict)
{
// Create a registry key containing all of the relevant attributes
@@ -289,6 +291,7 @@ public class ResourceReferenceRegistry
* Creates a default resource reference and registers it.
*
* @param key
+ * the data making up the resource reference
* @return The default resource created
*/
private ResourceReference addDefaultResourceReference(final Key key)
@@ -313,8 +316,8 @@ public class ResourceReferenceRegistry
}
else
{
- log.warn("Asked to auto-create a ResourceReference, but ResourceReferenceRegistry.createDefaultResourceReference() return null. " +
- " [" + key.toString() + "]");
+ log.warn("Asked to auto-create a ResourceReference, but ResourceReferenceRegistry.createDefaultResourceReference() return null. [{}]",
+ key);
}
return reference;
}
@@ -348,6 +351,7 @@ public class ResourceReferenceRegistry
* A {@link PackageResourceReference} will be created by default
*
* @param key
+ * the data making up the resource reference
* @return The RR created or null if not successful
*/
protected ResourceReference createDefaultResourceReference(final Key key)