Author: desruisseaux
Date: Wed Dec 5 07:52:58 2012
New Revision: 1417298
URL: http://svn.apache.org/viewvc?rev=1417298&view=rev
Log:
Renamed ObjectConverters to ValueConverter.
Added:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java
- copied, changed from r1416884,
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ObjectConverters.java
Removed:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ObjectConverters.java
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
Copied:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java
(from r1416884,
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ObjectConverters.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java?p2=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java&p1=sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ObjectConverters.java&r1=1416884&r2=1417298&rev=1417298&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ObjectConverters.java
(original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java
Wed Dec 5 07:52:58 2012
@@ -30,9 +30,9 @@ import static org.apache.sis.util.CharSe
/**
- * Performs conversions of objects encountered during XML (un)marshalling.
Each method in this
- * class is a converter and can be invoked at (un)marshalling time. The
default implementation
- * is straightforward and documented in the javadoc of each method.
+ * Performs conversions of XML element or attribute values encountered during
XML (un)marshalling.
+ * Each method in this class is a converter and can be invoked at
(un)marshalling time.
+ * The default implementation is straightforward and documented in the javadoc
of each method.
*
* <p>This class provides a way to handle the errors which may exist in some
XML documents.
* For example a URL in the document may be malformed, causing a {@link
MalformedURLException}
@@ -41,7 +41,7 @@ import static org.apache.sis.util.CharSe
* are known to be erroneous by fixed versions of those URLs. Example:</p>
*
* {@preformat java
- * class URLFixer extends ObjectConverters {
+ * class URLFixer extends ValueConverter {
* @Override
* public URL toURL(MarshalContext context, URI uri) throws
MalformedURLException {
* try {
@@ -57,27 +57,27 @@ import static org.apache.sis.util.CharSe
* }
* }
*
- * See the {@link XML#CONVERTERS} javadoc for an example of registering a
custom
- * {@code ObjectConverters} to a (un)marshaller.
+ * See the {@link XML#CONVERTER} javadoc for an example of registering a custom
+ * {@code ValueConverter} to a (un)marshaller.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.07)
* @version 0.3
* @module
*/
-public class ObjectConverters {
+public class ValueConverter {
/**
* The default, thread-safe and immutable instance. This instance defines
the
- * converters used during every (un)marshalling if no {@code
ObjectConverters}
+ * converters used during every (un)marshalling if no {@code
ValueConverter}
* was explicitly set.
*/
- public static final ObjectConverters DEFAULT = new ObjectConverters();
+ public static final ValueConverter DEFAULT = new ValueConverter();
/**
- * Creates a default {@code ObjectConverters}. This is for subclasses only,
+ * Creates a default {@code ValueConverter}. This is for subclasses only,
* since new instances are useful only if at least one method is
overridden.
*/
- protected ObjectConverters() {
+ protected ValueConverter() {
}
/**
@@ -87,7 +87,7 @@ public class ObjectConverters {
*
* <p>This method provides a single hook that subclasses can override in
order to provide their
* own error handling for every methods defined in this class, like the
example documented in
- * the {@link XML#CONVERTERS} javadoc. Subclasses also have the
possibility to override individual
+ * the {@link XML#CONVERTER} javadoc. Subclasses also have the possibility
to override individual
* {@code toXXX(â¦)} methods, like the example provided in this <a
href="#skip-navbar_top">class
* javadoc</a>.</p>
*
Modified:
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/package-info.java?rev=1417298&r1=1417297&r2=1417298&view=diff
==============================================================================
---
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
(original)
+++
sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
Wed Dec 5 07:52:58 2012
@@ -53,7 +53,7 @@
* <p>The most common namespace URLs are defined in the {@link
org.apache.sis.xml.Namespaces} class.
* The parsing of some objects like {@link java.net.URL} and {@link
java.util.UUID},
* together with the behavior in case of parsing error, can be specified by the
- * {@link org.apache.sis.xml.ObjectConverters} class.</p>
+ * {@link org.apache.sis.xml.ValueConverter} class.</p>
*
* @author Cédric Briançon (Geomatys)
* @author Guilhem Legal (Geomatys)