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/01/15 10:14:08 UTC

git commit: WICKET-4970 Move the logic for creating the proper PackageResource from PackageResourceReference to ResourceReferenceRegistry

Updated Branches:
  refs/heads/master be83d6acf -> 7aa92c24c


WICKET-4970 Move the logic for creating the proper PackageResource from PackageResourceReference to ResourceReferenceRegistry

Javadoc improvements


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7aa92c24
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7aa92c24
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7aa92c24

Branch: refs/heads/master
Commit: 7aa92c24c0a8a95f2bde0bdde3b837785c65c67e
Parents: be83d6a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 15 11:13:18 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 15 11:13:18 2013 +0200

----------------------------------------------------------------------
 .../resource/ResourceReferenceRegistry.java        |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7aa92c24/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 69abfbd..aeb4503 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
@@ -57,7 +57,7 @@ public class ResourceReferenceRegistry
 	// The Map (registry) maintaining the resource references
 	private final ConcurrentHashMap<Key, ResourceReference> map = Generics.newConcurrentHashMap();
 
-	// If combinations of paramaters (Key) have no registered resource reference yet, a default
+	// If combinations of parameters (Key) have no registered resource reference yet, a default
 	// resource reference can be created and added to the registry. The following list keeps track
 	// of all auto added references.
 	private Queue<Key> autoAddedQueue;
@@ -83,7 +83,7 @@ public class ResourceReferenceRegistry
 	 * 
 	 * @param reference
 	 *      the reference to register
-	 * @return True, if the resource was registered successfully or has been registered previously
+	 * @return {@code true} if the resource was registered successfully or has been registered previously
 	 *         already.
 	 */
 	public final boolean registerResourceReference(final ResourceReference reference)
@@ -99,7 +99,7 @@ public class ResourceReferenceRegistry
 	 * 
 	 * @param reference
 	 *      the reference to register
-	 * @return True, if the resource was registered successfully or has been registered previously
+	 * @return {@code true} if the resource was registered successfully or has been registered previously
 	 *         already.
 	 */
 	private Key _registerResourceReference(final ResourceReference reference)
@@ -118,11 +118,11 @@ public class ResourceReferenceRegistry
 	}
 
 	/**
-	 * Unregisters the given {@link ResourceReference}.
+	 * Unregisters a {@link ResourceReference} by its identifier.
 	 * 
 	 * @param key
 	 *            the {@link ResourceReference}'s identifier
-	 * @return Null, if the registry did not contain an entry for the resource reference.
+	 * @return The removed ResourceReference or {@code null} if the registry did not contain an entry for this key.
 	 */
 	public final ResourceReference unregisterResourceReference(final Key key)
 	{
@@ -322,7 +322,7 @@ public class ResourceReferenceRegistry
 	}
 
 	/**
-	 * The Number of RRs which can be auto-added is restricted (cache size). Remove entries, and
+	 * The number of {@link ResourceReference}s which can be auto-added is restricted (cache size). Remove entries, and
 	 * unregister excessive ones, if needed.
 	 * 
 	 * @param maxSize
@@ -351,7 +351,7 @@ public class ResourceReferenceRegistry
 	 * 
 	 * @param key
 	 *      the data making up the resource reference
-	 * @return The RR created or null if not successful
+	 * @return The {@link ResourceReference} created or {@code null} if not successful
 	 */
 	protected ResourceReference createDefaultResourceReference(final Key key)
 	{