Updated Branches: refs/heads/wicket-6.x e725f4285 -> f7a616bdb
WICKET-5470 Remove 'final' from org.apache.wicket.markup.html.form.EnumChoiceRenderer#getDisplayValue Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f7a616bd Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f7a616bd Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f7a616bd Branch: refs/heads/wicket-6.x Commit: f7a616bdb4d4f5dcea5f51040834298fa5521f9a Parents: e725f42 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Jan 13 11:15:34 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Jan 13 11:15:34 2014 +0200 ---------------------------------------------------------------------- .../apache/wicket/markup/html/form/EnumChoiceRenderer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f7a616bd/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java index 563e855..880240d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/EnumChoiceRenderer.java @@ -68,7 +68,7 @@ public class EnumChoiceRenderer<T extends Enum<T>> implements IChoiceRenderer<T> /** {@inheritDoc} */ @Override - public final Object getDisplayValue(T object) + public Object getDisplayValue(T object) { final String value; @@ -99,12 +99,13 @@ public class EnumChoiceRenderer<T extends Enum<T>> implements IChoiceRenderer<T> } /** - * Postprocesses the {@code value} after it is retrieved from the localizer. Default - * implementation escapes any markup found in the {@code value}. - * + * Postprocesses the {@code value} after it is retrieved from the localizer. + * * @param value * @return postprocessed value + * @deprecated Override #getDisplayValue() method and do the postprocessing after calling super.getDisplayValue(). */ + @Deprecated protected CharSequence postprocess(String value) { return value;
