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/01/13 10:15:41 UTC
git commit: WICKET-5470 Remove 'final' from
org.apache.wicket.markup.html.form.EnumChoiceRenderer#getDisplayValue
Updated Branches:
refs/heads/master e329e1e20 -> 0c638293f
WICKET-5470 Remove 'final' from org.apache.wicket.markup.html.form.EnumChoiceRenderer#getDisplayValue
Make #getDisplayValue() non-final and remove #postprocess()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0c638293
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0c638293
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0c638293
Branch: refs/heads/master
Commit: 0c638293fbc2b70d11db163bac0d846e2019838e
Parents: e329e1e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jan 13 11:12:48 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jan 13 11:12:48 2014 +0200
----------------------------------------------------------------------
.../markup/html/form/EnumChoiceRenderer.java | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0c638293/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 839bbb2..d19401c 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
@@ -21,7 +21,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.util.lang.Classes;
/**
- * {@link IChoiceRenderer} implementation that makes it easy to work with java 5 enums. This
+ * {@link ChoiceRenderer} implementation that makes it easy to work with java 5 enums. This
* renderer will attempt to lookup strings used for the display value using a localizer of a given
* component. If the component is not specified, the global instance of localizer will be used for
* lookups.
@@ -68,7 +68,7 @@ public class EnumChoiceRenderer<T extends Enum<T>> extends ChoiceRenderer<T>
/** {@inheritDoc} */
@Override
- public final Object getDisplayValue(T object)
+ public Object getDisplayValue(T object)
{
final String value;
@@ -83,7 +83,7 @@ public class EnumChoiceRenderer<T extends Enum<T>> extends ChoiceRenderer<T>
value = Application.get().getResourceSettings().getLocalizer().getString(key, null);
}
- return postprocess(value);
+ return value;
}
/**
@@ -98,18 +98,6 @@ public class EnumChoiceRenderer<T extends Enum<T>> extends ChoiceRenderer<T>
return Classes.simpleName(object.getDeclaringClass()) + '.' + object.name();
}
- /**
- * Postprocesses the {@code value} after it is retrieved from the localizer. Default
- * implementation escapes any markup found in the {@code value}.
- *
- * @param value
- * @return postprocessed value
- */
- protected CharSequence postprocess(String value)
- {
- return value;
- }
-
/** {@inheritDoc} */
@Override
public String getIdValue(T object, int index)