You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/08/16 22:21:51 UTC

git commit: WICKET-4703 add javadoc that load() is not used by assigmentwrapper, now final

Updated Branches:
  refs/heads/master a66d31ef6 -> 2c7f5c858


WICKET-4703 add javadoc that load() is not used by assigmentwrapper, now final


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

Branch: refs/heads/master
Commit: 2c7f5c8583a9f1d599e2de6478364d1a9f502e6e
Parents: a66d31e
Author: svenmeier <sv...@apache.org>
Authored: Thu Aug 16 22:21:21 2012 +0200
Committer: svenmeier <sv...@apache.org>
Committed: Thu Aug 16 22:21:21 2012 +0200

----------------------------------------------------------------------
 .../apache/wicket/model/StringResourceModel.java   |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/2c7f5c85/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
index aa11126..50f9047 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
@@ -389,7 +389,6 @@ public class StringResourceModel extends LoadableDetachableModel<String>
 		return Application.get().getResourceSettings().getLocalizer();
 	}
 
-
 	/**
 	 * Gets the string currently represented by this model. The string that is returned may vary for
 	 * each call to this method depending on the values contained in the model and an the parameters
@@ -578,9 +577,13 @@ public class StringResourceModel extends LoadableDetachableModel<String>
 
 	/**
 	 * Gets the string that this string resource model currently represents.
+	 * <p>
+	 * Note: This method is used only if this model is used directly without assignment to a
+	 * component, it is not called by the assignment wrapper returned from
+	 * {@link #wrapOnAssignment(Component)}.
 	 */
 	@Override
-	protected String load()
+	protected final String load()
 	{
 		return getString();
 	}