Repository: isis Updated Branches: refs/heads/master dcc7e0526 -> b03248ec5
Use generics for ConverterForObjectAdapter & ConverterForObjectAdapterMemento Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b03248ec Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b03248ec Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b03248ec Branch: refs/heads/master Commit: b03248ec56e79401b04f127b89220a1d03ae70e8 Parents: dcc7e05 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Feb 25 16:38:25 2015 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Feb 25 16:38:25 2015 +0200 ---------------------------------------------------------------------- .../integration/wicket/ConverterForObjectAdapter.java | 7 +++---- .../wicket/ConverterForObjectAdapterMemento.java | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/b03248ec/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java index 5c0d26d..940a1ef 100644 --- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java +++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java @@ -34,7 +34,7 @@ import org.apache.isis.core.runtime.system.context.IsisContext; * Implementation of a Wicket {@link IConverter} for {@link ObjectAdapter}s, * converting to-and-from their {@link Oid}'s string representation. */ -public class ConverterForObjectAdapter implements IConverter { +public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> { private static final long serialVersionUID = 1L; @@ -43,7 +43,7 @@ public class ConverterForObjectAdapter implements IConverter { * {@link ObjectAdapter}. */ @Override - public Object convertToObject(final String value, final Locale locale) { + public ObjectAdapter convertToObject(final String value, final Locale locale) { final Oid oid = RootOidDefault.deStringEncoded(value, getOidMarshaller()); return getAdapterManager().getAdapterFor(oid); } @@ -52,8 +52,7 @@ public class ConverterForObjectAdapter implements IConverter { * Converts {@link ObjectAdapter} to string representation of {@link Oid}. */ @Override - public String convertToString(final Object object, final Locale locale) { - final ObjectAdapter adapter = (ObjectAdapter) object; + public String convertToString(final ObjectAdapter adapter, final Locale locale) { final Oid oid = adapter.getOid(); if (oid == null) { // values don't have an Oid http://git-wip-us.apache.org/repos/asf/isis/blob/b03248ec/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java index f5b95ad..7de6544 100644 --- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java +++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java @@ -41,7 +41,7 @@ import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento; * {@link ObjectAdapterMemento}s, converting to-and-from their {@link Oid}'s * string representation. */ -public class ConverterForObjectAdapterMemento implements IConverter { +public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapterMemento> { private static final long serialVersionUID = 1L; @@ -50,7 +50,7 @@ public class ConverterForObjectAdapterMemento implements IConverter { * {@link ObjectAdapterMemento}. */ @Override - public Object convertToObject(final String value, final Locale locale) { + public ObjectAdapterMemento convertToObject(final String value, final Locale locale) { if (Strings.isNullOrEmpty(value)) { return null; } @@ -64,11 +64,10 @@ public class ConverterForObjectAdapterMemento implements IConverter { * {@link RootOid}. */ @Override - public String convertToString(final Object object, final Locale locale) { - if (object == null) { + public String convertToString(final ObjectAdapterMemento memento, final Locale locale) { + if (memento == null) { return null; } - final ObjectAdapterMemento memento = (ObjectAdapterMemento) object; final Oid oid = memento.getObjectAdapter(ConcurrencyChecking.NO_CHECK).getOid(); if (oid == null) { // values don't have an Oid...
