From cf6cf18f1acf19824a22357a84f820d0bc0f03ed Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 8 Jan 2014 14:27:58 +0100 Subject: [PATCH] Corrected CatchAllConverter ordering docs Corrected documentation regarding the CatchAllConverter in the XStream javadocs. --- .../java/org/springframework/oxm/xstream/CatchAllConverter.java | 2 +- .../java/org/springframework/oxm/xstream/XStreamMarshaller.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java index 8d9f4dfa45..8f7736b7a3 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/CatchAllConverter.java @@ -27,7 +27,7 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter; * (un)marshalling. *

Main purpose of this class is to * {@linkplain com.thoughtworks.xstream.XStream#registerConverter(com.thoughtworks.xstream.converters.Converter, int) register} - * this converter as a catchall last converter with a + * this converter as a catchall converter with a * {@linkplain com.thoughtworks.xstream.XStream#PRIORITY_NORMAL normal} * or higher priority, in addition to converters that explicitly support the domain * classes that should be supported. As a result, default XStream converters with lower diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java index 1377076d05..cffce25ee0 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java @@ -92,7 +92,7 @@ import org.springframework.util.xml.StaxUtils; * {@code XStreamMarshaller} to unmarshal external XML, set the * {@link #setSupportedClasses(Class[]) supportedClasses} and * {@link #setConverters(ConverterMatcher[]) converters} properties (possibly using a - * {@link CatchAllConverter} as the last converter in the list) or override the + * {@link CatchAllConverter}) or override the * {@link #customizeXStream(XStream)} method to make sure it only accepts the classes * you want it to support. *