You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2012/10/20 08:23:26 UTC
svn commit: r1400377 [3/4] - in /sis/branches/JDK6: ./
ide-project/NetBeans/nbproject/
sis-build-helper/src/main/java/org/apache/sis/internal/taglet/
sis-metadata/src/main/java/org/apache/sis/metadata/
sis-utility/src/main/java/org/apache/sis/internal/...
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/Collections.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/Collections.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/Collections.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/Collections.java Sat Oct 20 06:23:24 2012
@@ -36,7 +36,7 @@ import static java.util.Collections.unmo
/**
* Static methods working on {@link Collection} objects.
* This is an extension to the Java {@link java.util.Collections} utility class providing:
- * <p>
+ *
* <ul>
* <li>Null-safe {@link #clear(Collection) clear}, {@link #isNullOrEmpty(Collection) isNullOrEmpty}
* and {@link #addIfNonNull(Collection, Object) addIfNonNull} methods, for the convenience of
@@ -70,10 +70,10 @@ public final class Collections extends S
/**
* Clears the given collection, if non-null.
* If the given collection is null, then this method does nothing.
- * <p>
- * This is a convenience method for classes implementing the <cite>lazy instantiation</cite>
+ *
+ * <p>This is a convenience method for classes implementing the <cite>lazy instantiation</cite>
* pattern. In such cases, null collections (i.e. collections not yet instantiated) are typically
- * considered as {@linkplain Collection#isEmpty() empty}.
+ * considered as {@linkplain Collection#isEmpty() empty}.</p>
*
* @param collection The collection to clear, or {@code null}.
*/
@@ -86,10 +86,10 @@ public final class Collections extends S
/**
* Clears the given map, if non-null.
* If the given map is null, then this method does nothing.
- * <p>
- * This is a convenience method for classes implementing the <cite>lazy instantiation</cite>
+ *
+ * <p>This is a convenience method for classes implementing the <cite>lazy instantiation</cite>
* pattern. In such cases, null maps (i.e. maps not yet instantiated) are typically considered
- * as {@linkplain Map#isEmpty() empty}.
+ * as {@linkplain Map#isEmpty() empty}.</p>
*
* @param map The map to clear, or {@code null}.
*/
@@ -197,11 +197,11 @@ public final class Collections extends S
* in that it tries to returns a more efficient object when there is zero or one element.
* Such small set occurs frequently in Apache SIS, especially for
* {@link org.apache.sis.referencing.AbstractIdentifiedObject} names or identifiers.
- * <p>
- * <em>The set returned by this method may or may not be a view of the given set</em>.
+ *
+ * <p><em>The set returned by this method may or may not be a view of the given set</em>.
* Consequently this method shall be used <strong>only</strong> if the given set will
* <strong>not</strong> be modified after this method call. In case of doubt, use the
- * standard {@link java.util.Collections#unmodifiableSet(Set)} method instead.
+ * standard {@link java.util.Collections#unmodifiableSet(Set)} method instead.</p>
*
* @param <E> The type of elements in the set.
* @param set The set to make unmodifiable, or {@code null}.
@@ -232,11 +232,11 @@ public final class Collections extends S
* This method is different than the standard {@link java.util.Collections#unmodifiableMap(Map)}
* in that it tries to returns a more efficient object when there is zero or one entry.
* Such small maps occur frequently in Apache SIS.
- * <p>
- * <em>The map returned by this method may or may not be a view of the given map</em>.
+ *
+ * <p><em>The map returned by this method may or may not be a view of the given map</em>.
* Consequently this method shall be used <strong>only</strong> if the given map will
* <strong>not</strong> be modified after this method call. In case of doubt, use the
- * standard {@link java.util.Collections#unmodifiableMap(Map)} method instead.
+ * standard {@link java.util.Collections#unmodifiableMap(Map)} method instead.</p>
*
* @param <K> The type of keys in the map.
* @param <V> The type of values in the map.
@@ -269,14 +269,14 @@ public final class Collections extends S
* collection. The implementation class of the returned collection may be different than the
* class of the collection given in argument. The following table gives the types mapping
* applied by this method:
- * <p>
+ *
* <table class="sis">
- * <tr><th>Input type</th><th>Output type</th></tr>
- * <tr><td>{@link SortedSet}</td><td>{@link TreeSet}</td></tr>
- * <tr><td>{@link HashSet}</td><td>{@link HashSet}</td></tr>
- * <tr><td>{@link Set} other than above</td><td>{@link LinkedHashSet}</td></tr>
- * <tr><td>{@link Queue}</td><td>{@link LinkedList}</td></tr>
- * <tr><td>{@link List} or other {@link Collection}</td><td>{@link ArrayList}</td></tr>
+ * <tr><th>Input type</th> <th class="sep">Output type</th></tr>
+ * <tr><td>{@link SortedSet}</td> <td class="sep">{@link TreeSet}</td></tr>
+ * <tr><td>{@link HashSet}</td> <td class="sep">{@link HashSet}</td></tr>
+ * <tr><td>{@link Set} other than above</td> <td class="sep">{@link LinkedHashSet}</td></tr>
+ * <tr><td>{@link Queue}</td> <td class="sep">{@link LinkedList}</td></tr>
+ * <tr><td>{@link List} or other {@link Collection}</td><td class="sep">{@link ArrayList}</td></tr>
* </table>
*
* @param <E> The type of elements in the collection.
@@ -321,12 +321,12 @@ public final class Collections extends S
* Copies the content of the given map to a new unsynchronized, modifiable, in-memory map.
* The implementation class of the returned map may be different than the class of the map
* given in argument. The following table gives the types mapping applied by this method:
- * <p>
+ *
* <table class="sis">
- * <tr><th>Input type</th><th>Output type</th></tr>
- * <tr><td>{@link SortedMap}</td><td>{@link TreeMap}</td></tr>
- * <tr><td>{@link HashMap}</td><td>{@link HashMap}</td></tr>
- * <tr><td>{@link Map} other than above</td><td>{@link LinkedHashMap}</td></tr>
+ * <tr><th>Input type</th> <th class="sep">Output type</th></tr>
+ * <tr><td>{@link SortedMap}</td> <td class="sep">{@link TreeMap}</td></tr>
+ * <tr><td>{@link HashMap}</td> <td class="sep">{@link HashMap}</td></tr>
+ * <tr><td>{@link Map} other than above</td><td class="sep">{@link LinkedHashMap}</td></tr>
* </table>
*
* @param <K> The type of keys in the map.
@@ -358,7 +358,7 @@ public final class Collections extends S
/**
* Returns the given value as a collection. Special cases:
- * <p>
+ *
* <ul>
* <li>If the value is null, then this method returns an {@linkplain java.util.Collections#emptyList() empty list}.</li>
* <li>If the value is an instance of {@link Collection}, then it is returned unchanged.</li>
@@ -366,12 +366,12 @@ public final class Collections extends S
* <li>If the value is an instance of {@link Iterable}, {@link Iterator} or {@link Enumeration}, copies the values in a new list.</li>
* <li>Otherwise the value is returned as a {@linkplain java.util.Collections#singletonList(Object) singleton list}.</li>
* </ul>
- * <p>
- * Note that in the {@link Iterator} and {@link Enumeration} cases, the given value object
- * is not valid anymore after this method call since it has been used for the iteration.
- * <p>
- * If the returned object needs to be a list, then this method can be chained
- * with {@link #asList(Collection)} as below:
+ *
+ * <p>Note that in the {@link Iterator} and {@link Enumeration} cases, the given value object
+ * is not valid anymore after this method call since it has been used for the iteration.</p>
+ *
+ * <p>If the returned object needs to be a list, then this method can be chained
+ * with {@link #asList(Collection)} as below:</p>
*
* {@preformat java
* List<?> list = asList(asCollection(object));
@@ -413,13 +413,13 @@ public final class Collections extends S
/**
* Casts or copies the given collection to a list. Special cases:
- * <p>
+ *
* <ul>
* <li>If the given collection is {@code null}, then this method returns {@code null}.</li>
* <li>If the given collection is already a list, then it is returned unchanged.</li>
* <li>Otherwise the elements are copied in a new list, which is returned.</li>
* </ul>
- * <p>
+ *
* This method can be chained with {@link #asCollection(Object)}
* for handling a wider range of types:
*
@@ -484,9 +484,9 @@ public final class Collections extends S
* the second element are compared, and so on until either non-equal elements are found,
* or end-of-list are reached. In the later case, the shortest list is considered
* <cite>less than</cite> the longest one.
- * <p>
- * If both lists have the same length and equal elements in the sense of
- * {@link Comparable#compareTo}, then the comparator returns 0.
+ *
+ * <p>If both lists have the same length and equal elements in the sense of
+ * {@link Comparable#compareTo}, then the comparator returns 0.</p>
*
* @param <T> The type of elements in both lists.
* @return The ordering between two lists.
@@ -511,10 +511,10 @@ public final class Collections extends S
/**
* Returns a comparator for arbitrary collections of comparable elements. The elements are
* compared in iteration order as for the {@linkplain #listComparator list comparator}.
- * <p>
- * <em>This comparator make sense only for collections having determinist order</em>
+ *
+ * <p><em>This comparator make sense only for collections having determinist order</em>
* like {@link java.util.TreeSet}, {@link java.util.LinkedHashSet} or queues.
- * Do <strong>not</strong> use it with {@link java.util.HashSet}.
+ * Do <strong>not</strong> use it with {@link java.util.HashSet}.</p>
*
* @param <T> The type of elements in both collections.
* @return The ordering between two collections.
@@ -528,9 +528,9 @@ public final class Collections extends S
* Returns the capacity to be given to the {@link java.util.HashMap#HashMap(int) HashMap}
* constructor for holding the given number of elements. This method computes the capacity
* for the default <cite>load factor</cite>, which is 0.75.
- * <p>
- * The same calculation can be used for {@link java.util.LinkedHashMap} and
- * {@link java.util.HashSet} as well, which are built on top of {@code HashMap}.
+ *
+ * <p>The same calculation can be used for {@link java.util.LinkedHashMap} and
+ * {@link java.util.HashSet} as well, which are built on top of {@code HashMap}.</p>
*
* @param elements The number of elements to be put into the hash map or hash set.
* @return The optimal initial capacity to be given to the hash map constructor.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java Sat Oct 20 06:23:24 2012
@@ -179,7 +179,7 @@ abstract class WeakEntry<E> extends Weak
}
/**
- * IF the number of elements is lower than this threshold, then the table should be
+ * If the number of elements is lower than this threshold, then the table should be
* rehashed for saving space.
*
* @param capacity The table capacity.
@@ -190,7 +190,7 @@ abstract class WeakEntry<E> extends Weak
}
/**
- * IF the number of elements is upper than this threshold, then the table should be
+ * If the number of elements is upper than this threshold, then the table should be
* rehashed for better performance.
*
* @param capacity The table capacity.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java Sat Oct 20 06:23:24 2012
@@ -41,11 +41,11 @@ import org.apache.sis.internal.util.Obje
* not prevent the entry from being discarded by the garbage collector, that is, made finalizable,
* finalized, and then reclaimed. When an entry has been discarded it is effectively removed from
* the set, so this class behaves somewhat differently than other {@link java.util.Set} implementations.
- * <p>
- * If the elements stored in this set are arrays like {@code int[]}, {@code float[]} or
+ *
+ * <p>If the elements stored in this set are arrays like {@code int[]}, {@code float[]} or
* {@code Object[]}, then the hash code computations and the comparisons are performed using
* the static {@code hashCode(a)} and {@code equals(a1, a2)} methods defined in the {@link Arrays}
- * class.
+ * class.</p>
*
* {@section Optimizing memory use in factory implementations}
* The {@code WeakHashSet} class has a {@link #get(Object)} method that is not part of the
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java Sat Oct 20 06:23:24 2012
@@ -45,9 +45,9 @@ import org.apache.sis.internal.util.Obje
* will automatically be removed when its value is no longer in ordinary use. This class is
* similar to the standard {@link java.util.WeakHashMap} class provided in J2SE, except that
* weak references are hold on values instead of keys.
- * <p>
- * This class is convenient for avoiding the creation of duplicated elements, as in the
- * example below:
+ *
+ * <p>This class is convenient for avoiding the creation of duplicated elements, as in the
+ * example below:</p>
*
* {@preformat java
* K key = ...
@@ -64,10 +64,10 @@ import org.apache.sis.internal.util.Obje
* The calculation of a new value should be fast, because it is performed inside a synchronized
* statement blocking all other access to the map. This is okay if that particular map instance
* is not expected to be used in a highly concurrent environment.
- * <p>
- * Note that this class is <strong>not</strong> a cache, because the entries are discarded
+ *
+ * <p>Note that this class is <strong>not</strong> a cache, because the entries are discarded
* as soon as the garbage collector determines that they are no longer in use. If caching
- * service are wanted, or if concurrency are wanted, consider using {@link Cache} instead.
+ * service are wanted, or if concurrency are wanted, consider using {@link Cache} instead.</p>
*
* @param <K> The class of key elements.
* @param <V> The class of value elements.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/collection/package-info.java Sat Oct 20 06:23:24 2012
@@ -18,21 +18,22 @@
/**
* Addition to the collection framework. Most classes in this package implement interfaces
* from the <cite>Java Collection Framework</cite> defined in the {@link java.util} package.
- * <ul>
- * <li><p>
+ *
+ * <ul class="verbose">
+ * <li>
* {@link org.apache.sis.util.collection.WeakHashSet} provides a way to ensure that
* a factory returns unique instances for all values that are equal in the sense of
* {@link java.util.Objects#deepEquals(Object, Object) Objects.deepEquals(Object, Object)}.
* The values that were created in previous factory operations are retained by
* {@linkplain java.lang.ref.WeakReference weak references} for reuse.
- * </p></li><li><p>
+ * </li><li>
* {@link org.apache.sis.util.collection.Cache} and
* {@link org.apache.sis.util.collection.WeakValueHashMap} are {@link java.util.Map java.util.Map}
* implementations that may be used for some caching or pseudo-caching functionalities. The
* {@link org.apache.sis.util.collection.Cache} implementation is the most full-featured one
* and supports concurrency, while the other implementations are more lightweight, sometime
* thread-safe but without concurrency support.
- * </p></li><li><p>
+ * </li><li>
* {@link org.apache.sis.util.collection.CheckedContainer},
* {@link org.apache.sis.util.collection.CheckedArrayList},
* {@link org.apache.sis.util.collection.CheckedHashSet} and
@@ -42,21 +43,21 @@
* combine both functionalities in a single class (so reducing the amount of indirection), provide
* a hook for making the collections read-only and allow the caller to specify the synchronization
* lock of his choice.
- * </p></li><li><p>
+ * </li><li>
* {@link org.apache.sis.util.collection.DerivedMap} and
* {@link org.apache.sis.util.collection.DerivedSet} are wrapper collections in which the
* keys or the values are derived on-the-fly from the content of an other collection.
- * </p></li><li><p>
+ * </li><li>
* {@link org.apache.sis.util.collection.IntegerList} and
* {@link org.apache.sis.util.collection.RangeSet} are collections specialized for a particular kind
* of content, providing more efficient storage than what we would get with the general-purpose
* collection implementations.
- * </p></li><li><p>
+ * </li><li>
* {@link org.apache.sis.util.collection.DisjointSet},
* {@link org.apache.sis.util.collection.KeySortedList} and
* {@link org.apache.sis.util.collection.FrequencySortedSet} provides specialized ways to
* organize their elements.
- * </p></li>
+ * </li>
* </ul>
*
* @author Martin Desruisseaux (IRD, Geomatys)
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java Sat Oct 20 06:23:24 2012
@@ -36,19 +36,19 @@ import org.apache.sis.util.Debug;
* {@link #finer(String) finer} and {@link #finest(String) finest} methods as <em>abstract</em>
* ones. Subclasses should implement those methods in order to map JDK logging levels to
* the backend logging framework.
- * <p>
- * All {@link #log(Level,String) log} methods are overridden in order to redirect to one of the
+ *
+ * <p>All {@link #log(Level,String) log} methods are overridden in order to redirect to one of the
* above-cited methods. Note that this is the opposite approach than the JDK logging framework
* one, which implements everything on top of {@link Logger#log(LogRecord)}. This adapter is
* defined in terms of {@link #severe(String) severe} ⦠{@link #finest(String) finest} methods
* instead because external frameworks like <a href="http://commons.apache.org/logging/">Commons-logging</a>
* don't work with {@link LogRecord}, and sometime provides nothing else than convenience methods
- * equivalent to {@link #severe(String) severe} … {@link #finest(String) finest}.
+ * equivalent to {@link #severe(String) severe} … {@link #finest(String) finest}.</p>
*
* {@section Restrictions}
* Because the configuration is expected to be fully controlled by the external logging
* framework, every configuration methods inherited from {@link Logger} are disabled:
- * <p>
+ *
* <ul>
* <li>{@link #addHandler(Handler)}
* since the handling is performed by the external framework.</li>
@@ -64,7 +64,7 @@ import org.apache.sis.util.Debug;
* <li>{@link #setFilter(Filter)}
* for keeping this {@code LoggerAdapter} simple.</li>
* </ul>
- * <p>
+ *
* Since {@code LoggerAdapter}s do not hold any configuration by themselves, it is not strictly
* necessary to {@linkplain java.util.logging.LogManager#addLogger add them to the log manager}.
* The adapters can be created, garbage-collected and recreated again while preserving their
@@ -465,7 +465,7 @@ public abstract class LoggerAdapter exte
/**
* Logs a record at the specified level.
- * The defaut implementation formats the message immediately, then delegates to
+ * The default implementation formats the message immediately, then delegates to
* <code>{@linkplain #log(Level,String) log}(level, message)</code>.
*
* @param level One of the message level identifiers.
@@ -478,7 +478,7 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a record at the specified level. The defaut implementation discards
+ * Logs a record at the specified level. The default implementation discards
* the source class and source method, then delegates to
* <code>{@linkplain #log(Level,String) log}(level, message)</code>.
*
@@ -495,7 +495,7 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a record at the specified level. The defaut implementation discards
+ * Logs a record at the specified level. The default implementation discards
* the source class and source method, then delegates to
* <code>{@linkplain #log(Level,String,Throwable) log}(level, message, thrown)</code>.
*
@@ -513,13 +513,13 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a record at the specified level. The defaut implementation delegates to
+ * Logs a record at the specified level. The default implementation delegates to
* <code>{@linkplain #logp(Level,String,String,String,Object[]) logp}(level, sourceClass,
* sourceMethod, message, params)</code> where the {@code params} array is built from the
* {@code param} object.
- * <p>
- * Note that {@code sourceClass} and {@code sourceMethod} will be discarded unless the
- * target {@link #logp(Level,String,String,String) logp} method has been overridden.
+ *
+ * <p>Note that {@code sourceClass} and {@code sourceMethod} will be discarded unless the
+ * target {@link #logp(Level,String,String,String) logp} method has been overridden.</p>
*
* @param level One of the message level identifiers.
* @param sourceClass Name of class that issued the logging request.
@@ -535,12 +535,12 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a record at the specified level. The defaut implementation formats the message
+ * Logs a record at the specified level. The default implementation formats the message
* immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String)
* logp}(level, sourceClass, sourceMethod, message)</code>.
- * <p>
- * Note that {@code sourceClass} and {@code sourceMethod} will be discarded unless the
- * target {@link #logp(Level,String,String,String) logp} method has been overridden.
+ *
+ * <p>Note that {@code sourceClass} and {@code sourceMethod} will be discarded unless the
+ * target {@link #logp(Level,String,String,String) logp} method has been overridden.</p>
*
* @param level One of the message level identifiers.
* @param sourceClass Name of class that issued the logging request.
@@ -556,7 +556,7 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a localizable record at the specified level. The defaut implementation localizes the
+ * Logs a localizable record at the specified level. The default implementation localizes the
* message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String)
* logp}(level, sourceClass, sourceMethod, message)</code>.
*
@@ -574,7 +574,7 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a localizable record at the specified level. The defaut implementation localizes the
+ * Logs a localizable record at the specified level. The default implementation localizes the
* message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
* Throwable) logp}(level, sourceClass, sourceMethod, message, thrown)</code>.
*
@@ -593,7 +593,7 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a localizable record at the specified level. The defaut implementation localizes the
+ * Logs a localizable record at the specified level. The default implementation localizes the
* message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
* Object) logp}(level, sourceClass, sourceMethod, message, param)</code>.
*
@@ -612,7 +612,7 @@ public abstract class LoggerAdapter exte
}
/**
- * Logs a localizable record at the specified level. The defaut implementation localizes the
+ * Logs a localizable record at the specified level. The default implementation localizes the
* message immediately, then delegates to <code>{@linkplain #logp(Level,String,String,String,
* Object[]) logp}(level, sourceClass, sourceMethod, message, params)</code>.
*
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java Sat Oct 20 06:23:24 2012
@@ -38,11 +38,11 @@ import static org.apache.sis.util.Arrays
* than {@link Logger#getLogger(String)}, in order to give SIS a chance to redirect the logging
* to an other framework like <A HREF="http://commons.apache.org/logging/">Commons-logging</A> or
* <A HREF="http://logging.apache.org/log4j">Log4J</A>.
- * <p>
- * This method provides also a {@link #log(Class, String, LogRecord)} convenience static method, which
- * {@linkplain LogRecord#setLoggerName set the logger name} of the given record before to log it.
- * An other worthy static method is {@link #unexpectedException(Class, String, Throwable)}, for
- * reporting an anomalous but nevertheless non-fatal exception.
+ *
+ * <p>This method provides also a {@link #log(Class, String, LogRecord)} convenience static method,
+ * which {@linkplain LogRecord#setLoggerName set the logger name} of the given record before to log
+ * it. An other worthy static method is {@link #unexpectedException(Class, String, Throwable)}, for
+ * reporting an anomalous but nevertheless non-fatal exception.</p>
*
* {@section Configuration}
* The log records can be redirected explicitly to an other logging framework using the
@@ -95,10 +95,11 @@ public final class Logging extends Stati
/**
* The children {@link Logging} objects.
- * <p>
- * The plain array used there is not efficient for adding new items (an {@code ArrayList}
- * would be more efficient), but we assume that very few new items will be added. Furthermore
- * a plain array is efficient for reading, and the later is way more common than the former.
+ *
+ * {@note The array used there is not efficient for adding new items (<code>ArrayList</code>
+ * would be more efficient), but we assume that very few new items will be added.
+ * Furthermore a plain array is efficient for reading, and the later is way more
+ * common than the former.}
*/
private Logging[] children = EMPTY;
@@ -140,7 +141,7 @@ public final class Logging extends Stati
/**
* Logs the given record to the logger associated to the given class.
* This convenience method performs the following steps:
- * <p>
+ *
* <ul>
* <li>Get the logger using {@link #getLogger(Class)};</li>
* <li>{@linkplain LogRecord#setLoggerName(String) Set the logger name} of the given record,
@@ -190,9 +191,9 @@ public final class Logging extends Stati
* It gives SIS a chance to redirect logging events to
* <A HREF="http://commons.apache.org/logging/">commons-logging</A>
* or some equivalent framework.
- * <p>
- * If no factory was found or if the factory choose to not redirect the loggings, then this
- * method returns the usual <code>{@linkplain Logger#getLogger Logger.getLogger}(name)</code>.
+ *
+ * <p>If no factory was found or if the factory choose to not redirect the loggings, then this
+ * method returns the usual <code>{@linkplain Logger#getLogger Logger.getLogger}(name)</code>.</p>
*
* @param name The logger name.
* @return A logger for the specified name.
@@ -217,10 +218,10 @@ public final class Logging extends Stati
/**
* Returns a {@code Logging} instance for the specified base logger.
* This instance can be used for controlling logging configuration in SIS.
- * <p>
- * {@code Logging} instances follow the same hierarchy than {@link Logger}, i.e.
+ *
+ * <p>{@code Logging} instances follow the same hierarchy than {@link Logger}, i.e.
* {@code "org.apache.sis"} is the parent of {@code "org.apache.sis.referencing"},
- * {@code "org.apache.sis.metadata"}, <i>etc</i>.
+ * {@code "org.apache.sis.metadata"}, <i>etc</i>.</p>
*
* @param name The base logger name.
* @return The logging instance for the given name.
@@ -285,9 +286,9 @@ public final class Logging extends Stati
* Sets a new logger factory for this {@code Logging} instance and every children. The
* specified factory will be used by <code>{@linkplain #getLogger(String) getLogger}(name)</code>
* when {@code name} is this {@code Logging} name or one of its children.
- * <p>
- * If the factory is set to {@code null} (the default), then the standard Logging framework
- * will be used.
+ *
+ * <p>If the factory is set to {@code null} (the default), then the standard Logging framework
+ * will be used.</p>
*
* @param factory The new logger factory, or {@code null} if none.
*/
@@ -328,10 +329,10 @@ public final class Logging extends Stati
* The factory found on the classpath is given to {@link #setLoggerFactory(LoggerFactory)}.
* If more than one factory is found, then the log messages will be sent to the logging
* frameworks managed by all those factories.
- * <p>
- * This method usually doesn't need to be invoked explicitly, since it is automatically
+ *
+ * <p>This method usually doesn't need to be invoked explicitly, since it is automatically
* invoked on {@code Logging} class initialization. However developers may invoke it if
- * new {@code LoggerFactory}s are added later on the classpath of a running JVM.
+ * new {@code LoggerFactory}s are added later on the classpath of a running JVM.</p>
*/
@Configuration
public void scanLoggerFactory() {
@@ -350,10 +351,10 @@ public final class Logging extends Stati
* Flushes all {@linkplain Handler handlers} used by the logger named {@link #name}.
* If that logger {@linkplain Logger#getUseParentHandlers() uses parent handlers},
* then those handlers will be flushed as well.
- * <p>
- * If the log records seem to be interleaved with the content of {@link System#out}
+ *
+ * <p>If the log records seem to be interleaved with the content of {@link System#out}
* or {@link System#err}, invoking this method before to write to the standard streams
- * may help.
+ * may help.</p>
*
* @see Handler#flush()
*/
@@ -394,10 +395,10 @@ public final class Logging extends Stati
* class name and method name can optionally be specified. If any of them is
* {@code null}, then it will be inferred from the error stack trace as in
* {@link #unexpectedException(Logger, Throwable)}.
- * <p>
- * Explicit value for class and method names are sometime preferred to automatic
- * inference for the following reasons:
- * <p>
+ *
+ * <p>Explicit value for class and method names are sometime preferred to automatic
+ * inference for the following reasons:</p>
+ *
* <ul>
* <li>Automatic inference is not 100% reliable, since the Java Virtual Machine
* is free to omit stack frame in optimized code.</li>
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java Sat Oct 20 06:23:24 2012
@@ -29,15 +29,15 @@ import static org.apache.sis.util.Argume
* {@link #SLOWER} and {@link #SLOWEST} - are provided in order to log only the events taking
* more than some time duration. For example the console could log only the slowest events,
* while a file could log all events considered slow.
- * <p>
- * Every levels defined in this class have a {@linkplain #intValue() value} between the
+ *
+ * <p>Every levels defined in this class have a {@linkplain #intValue() value} between the
* {@link Level#FINE} and {@link Level#CONFIG} values. Consequently performance logging are
* disabled by default, and enabling them imply enabling configuration logging too. This is
- * done that way because the configuration typically have a significant impact on performance.
+ * done that way because the configuration typically have a significant impact on performance.</p>
*
* {@section Enabling performance logging}
* Performance logging can be enabled in various ways. Among others:
- * <p>
+ *
* <ul>
* <li>The {@code $JAVA_HOME/lib/logging.properties} file can be edited in order to log
* messages at the {@code FINE} level, at least for the packages of interest.</li>
@@ -139,7 +139,7 @@ public final class PerformanceLevel exte
/**
* Sets the minimal duration for logging an event at this level. Invoking this method
* may have an indirect impact of other performance levels:
- * <p>
+ *
* <ul>
* <li>If the given duration is longer than the duration of slower levels, then the later
* are also set to the given duration.</li>
@@ -148,8 +148,8 @@ public final class PerformanceLevel exte
* </ul>
*
* {@note The duration of the <code>PERFORMANCE</code> level can not be modified: it is
- * always zero. However invoking this method on the <code>PERFORMANCE</code> field will
- * ensure that every <code>SLOW*</code> levels will have at least the given duration.}
+ * always zero. However invoking this method on the <code>PERFORMANCE</code> field will
+ * ensure that every <code>SLOW*</code> levels will have at least the given duration.}
*
* @param duration The minimal duration.
* @param unit The unit of the given duration value.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/logging/package-info.java Sat Oct 20 06:23:24 2012
@@ -18,7 +18,7 @@
/**
* Extensions to the {@linkplain java.util.logging JDK logging} framework.
* This package provides:
- * <p>
+ *
* <ul>
* <li>A {@link org.apache.sis.util.logging.Logging} utility class with static methods for
* fetching a logger (see <cite>Choosing a logging framework</cite> below) or logging an
@@ -33,11 +33,11 @@
* The SIS project uses the standard {@link java.util.logging.Logger} API for its logging,
* but this package allows redirection of logging messages to some other frameworks like
* <a href="http://logging.apache.org/log4j/">Log4J</a>.
- * <p>
- * We recommend to stick to standard JDK logging when possible. However if inter-operability
+ *
+ * <p>We recommend to stick to standard JDK logging when possible. However if inter-operability
* with an other logging framework is required, then the only action needed is to include
- * <strong>one</strong> of the following JAR on the classpath:
- * <p>
+ * <strong>one</strong> of the following JAR on the classpath:</p>
+ *
* <ul>
* <li>{@code geotk-logging-commons.jar} for Apache logging</li>
* <li>{@code geotk-logging-log4j.jar} for Log4J logging</li>
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/package-info.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/package-info.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/package-info.java Sat Oct 20 06:23:24 2012
@@ -19,7 +19,7 @@
* Simple data objects and miscellaneous utilities. This package provides:
*
* <ul>
- * <li><p>General purpose static methods working on:</p>
+ * <li>General purpose static methods working on:
* <ul>
* <li>Primitive or basic Java types:
* {@link org.apache.sis.util.Characters},
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java Sat Oct 20 06:23:24 2012
@@ -52,8 +52,8 @@ import static org.apache.sis.util.Arrays
* inner classes, with the side-effect of compile-time safety. Because integer constants are
* inlined right into class files at compile time, the declarative classes is never loaded at
* run time.
- * <p>
- * This class also provides facilities for string formatting using {@link MessageFormat}.
+ *
+ * <p>This class also provides facilities for string formatting using {@link MessageFormat}.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.3 (derived from geotk-1.2)
@@ -438,12 +438,12 @@ public class IndexedResourceBundle exten
* by {@link MessageFormat}. If {@code arguments} is already an array, then that array or
* a copy of that array will be returned. If {@code arguments} is not an array, it will be
* placed in an array of length 1.
- * <p>
- * All the array elements will be checked for {@link CharSequence}, {@link InternationalString},
+ *
+ * <p>All the array elements will be checked for {@link CharSequence}, {@link InternationalString},
* {@link Throwable} or {@link Class} instances. All {@code InternationalString} instances will
* be localized according this resource bundle locale. Any characters sequences of length
* greater than {@link #MAX_STRING_LENGTH} will be reduced using the
- * {@link CharSequences#shortSentence(CharSequence, int)} method.
+ * {@link CharSequences#shortSentence(CharSequence, int)} method.</p>
*
* @param arguments The object to check.
* @return {@code arguments} as an array, eventually with some elements replaced.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java Sat Oct 20 06:23:24 2012
@@ -32,22 +32,22 @@
* </ul>
*
* {@note <code>java.util.Formatter</code> is an alternative to <code>MessageFormat</code> providing
- * similar functionalities with a C/C++ like syntax. However <code>MessageFormat</code> has two
- * advantages: it provides a <code>choice</code> format type (useful for handling plural forms),
- * and localizes properly objects of unspecified type (by contrast, the <code>Formatter</code>
- * <code>"%s"</code> type always invoke <code>toString()</code>). The later advantage is
- * important for messages in wich the same argument could receive <code>Number</code> or
- * <code>Date</code> instances as well as <code>String</code>.
- * Furthermore, the <code>java.util.logging</code> framework is designed for use with
- * <code>MessageFormat</code> (see the <code>Formatter.formatMessage(LogRecord)</code> method).}
+ * similar functionalities with a C/C++ like syntax. However <code>MessageFormat</code> has two
+ * advantages: it provides a <code>choice</code> format type (useful for handling plural forms),
+ * and localizes properly objects of unspecified type (by contrast, the <code>Formatter</code>
+ * <code>"%s"</code> type always invoke <code>toString()</code>). The later advantage is
+ * important for messages in wich the same argument could receive <code>Number</code> or
+ * <code>Date</code> instances as well as <code>String</code>.
+ * Furthermore, the <code>java.util.logging</code> framework is designed for use with
+ * <code>MessageFormat</code> (see the <code>Formatter.formatMessage(LogRecord)</code> method).}
*
- * <p>Apache SIS developers can add resources by editing the {@code *.properties} file
+ * Apache SIS developers can add resources by editing the {@code *.properties} file
* in the source code directory, then run the localized resources compiler provided in the
* <code><a href="{@website}/sis-build-helper/index.html">sis-build-helper</a></code> module.
* Developers shall <strong>not</strong> apply the {@code MessageFormat} rules for using quotes,
* since the resources compiler will apply itself the <cite>doubled single quotes</cite> when
* necessary. This avoid the unfortunate confusion documented in the warning section of
- * {@link java.text.MessageFormat} javadoc.</p>
+ * {@link java.text.MessageFormat} javadoc.
*
* {@section Usage}
* All {@link org.apache.sis.util.resources.IndexedResourceBundle} subclasses provide a
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/AbstractInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/AbstractInternationalString.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/AbstractInternationalString.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/AbstractInternationalString.java Sat Oct 20 06:23:24 2012
@@ -30,9 +30,9 @@ import org.opengis.util.InternationalStr
* for the {@link String} class whenever an attribute needs to be internationalization capable.
* The default value (as returned by {@link #toString()} and other {@link CharSequence} methods)
* is the string in the current {@linkplain Locale#getDefault() system-wide default locale}.
- * <p>
- * The {@linkplain Comparable natural ordering} is defined by the value returned by
- * {@link #toString()}.
+ *
+ * <p>The {@linkplain Comparable natural ordering} is defined by the value returned by
+ * {@link #toString()}.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.3 (derived from geotk-2.1)
@@ -134,9 +134,9 @@ public abstract class AbstractInternatio
/**
* Returns this string in the default locale. Invoking this method is equivalent to invoking
* <code>{@linkplain #toString(Locale) toString}({@linkplain Locale#getDefault()})</code>.
- * <p>
- * All methods from {@link CharSequence} operate on this string.
- * This string is also used as the criterion for {@linkplain Comparable natural ordering}.
+ *
+ * <p>All methods from {@link CharSequence} operate on this string.
+ * This string is also used as the criterion for {@linkplain Comparable natural ordering}.</p>
*
* @return The string in the default locale.
*/
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/DefaultInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/DefaultInternationalString.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/DefaultInternationalString.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/DefaultInternationalString.java Sat Oct 20 06:23:24 2012
@@ -155,14 +155,14 @@ public class DefaultInternationalString
* {@code DefaultInternationalString} during iteration through the
* {@linkplain java.util.Map.Entry entries} in a {@link Map}. It infers the {@link Locale}
* from the property {@code key}, using the following steps:
- * <p>
+ *
* <ul>
* <li>If the {@code key} does not start with the specified {@code prefix}, then
* this method does nothing and returns {@code false}.</li>
* <li>Otherwise, the characters after the {@code prefix} are parsed as an ISO language
* and country code, and the {@link #add(Locale, String)} method is invoked.</li>
* </ul>
- * <p>
+ *
* For example if the prefix is {@code "remarks"}, then the {@code "remarks_fr"} property key
* stands for remarks in {@linkplain Locale#FRENCH French} while the {@code "remarks_fr_CA"}
* property key stands for remarks in {@linkplain Locale#CANADA_FRENCH French Canadian}.
@@ -260,7 +260,7 @@ public class DefaultInternationalString
* identifiers often look like English words, they are not considered as the
* {@linkplain Locale#ENGLISH English locale}. In order to produce a value close
* to the common practice, this method handles {@code null} argument value as below:
- * <p>
+ *
* <ul>
* <li>If a string has been explicitly {@linkplain #add(Locale, String) added} for the
* {@code null} locale, then that string is returned.</li>
@@ -323,7 +323,7 @@ public class DefaultInternationalString
/**
* Returns {@code true} if all localized texts stored in this international string are
* contained in the specified object. More specifically:
- * <p>
+ *
* <ul>
* <li>If {@code candidate} is an instance of {@link InternationalString}, then this method
* returns {@code true} if, for all <var>{@linkplain Locale locale}</var>-<var>{@linkplain
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/Types.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/Types.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/Types.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/Types.java Sat Oct 20 06:23:24 2012
@@ -32,7 +32,7 @@ import org.apache.sis.util.collection.Ba
/**
* Convenience methods working on GeoAPI types.
* The methods in this class can be used for:
- * <p>
+ *
* <ul>
* <li>Creating {@link InternationalString} instances from {@link CharSequence} instances.</li>
* <li>Mapping ISO identifiers to the GeoAPI types (interfaces or {@linkplain CodeList code lists}).</li>
@@ -61,7 +61,7 @@ public final class Types extends Static
/**
* Returns the ISO name for the given class, or {@code null} if none.
* Examples:
- * <p>
+ *
* <ul>
* <li><code>getStandardName({@linkplain org.opengis.metadata.citation.Citation}.class)</code> returns {@code "CI_Citation"}.</li>
* <li><code>getStandardName({@linkplain org.opengis.referencing.cs.AxisDirection}.class)</code> returns {@code "CS_AxisDirection"}. </li>
@@ -85,12 +85,12 @@ public final class Types extends Static
* The identifier argument shall be the value documented in the {@link UML#identifier()}
* annotation associated with the GeoAPI interface.
* Examples:
- * <p>
+ *
* <ul>
* <li>{@code forStandardName("CI_Citation")} returns <code>{@linkplain org.opengis.metadata.citation.Citation}.class</code></li>
* <li>{@code forStandardName("CS_AxisDirection")} returns <code>{@linkplain org.opengis.referencing.cs.AxisDirection}.class</code></li>
* </ul>
- * <p>
+ *
* Only identifiers for the stable part of GeoAPI are recognized. This method does not handle
* the identifiers for the {@code geoapi-pending} module.
*
@@ -153,9 +153,9 @@ public final class Types extends Static
* returns it unchanged. Otherwise a new array of type {@code InternationalString[]} is created
* and every elements from the given array is copied or
* {@linkplain #toInternationalString(CharSequence) converted} in the new array.
- * <p>
- * If a defensive copy of the {@code strings} array is wanted, then the caller needs to check
- * if the returned array is the same instance than the one given in argument to this method.
+ *
+ * <p>If a defensive copy of the {@code strings} array is wanted, then the caller needs to check
+ * if the returned array is the same instance than the one given in argument to this method.</p>
*
* @param strings The characters sequences to convert, or {@code null}.
* @return The given array as an array of type {@code InternationalString[]},
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/util/type/package-info.java Sat Oct 20 06:23:24 2012
@@ -19,7 +19,7 @@
* Implementation of GeoAPI types from the {@link org.opengis.util} package.
* All those types except {@code InternationalString} are derived from the ISO 19103 specification.
* The main content of this package are:
- * <p>
+ *
* <ul>
* <li>Implementations of {@link org.opengis.util.InternationalString}:
* <ul>
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java Sat Oct 20 06:23:24 2012
@@ -26,11 +26,11 @@ import org.opengis.metadata.citation.Cit
* a namespace identified by a {@link Citation}. The namespace can be some organization like
* <a href="http://www.epsg.org">EPSG</a> for Coordinate Reference System objects, or a
* well-known acronym like ISBN for <cite>International Standard Book Number</cite>.
- * <p>
- * When an identified object is marshalled in a ISO 19139 compliant XML document, some identifiers
+ *
+ * <p>When an identified object is marshalled in a ISO 19139 compliant XML document, some identifiers
* are handled in a special way: they appear as {@code gml:id}, {@code gco:uuid} or {@code xlink:href}
* attributes of the XML element. Those identifiers can be specified using the {@link IdentifierSpace}
- * enum values as below:
+ * enum values as below:</p>
*
* {@preformat java
* IdentifiedObject object = ...;
@@ -48,15 +48,15 @@ import org.opengis.metadata.citation.Cit
* {@code uuid} or {@code href} attributes, since they are specific to XML marshalling (they do not
* appear in OGC/ISO abstract specifications). This {@code IdentifiedObject} interface provides a
* way to handle those identifiers.
- * <p>
- * Note that GeoAPI defines a similar interface, also named {@link org.opengis.referencing.IdentifiedObject}.
+ *
+ * <p>Note that GeoAPI defines a similar interface, also named {@link org.opengis.referencing.IdentifiedObject}.
* However that GeoAPI interface is not of general use, since it contains methods like
* {@link org.opengis.referencing.IdentifiedObject#toWKT() toWKT()} that are specific to referencing
* or geometric objects. In addition, the GeoAPI interface defines some attributes
* ({@linkplain org.opengis.referencing.IdentifiedObject#getName() name},
* {@linkplain org.opengis.referencing.IdentifiedObject#getAlias() alias},
* {@linkplain org.opengis.referencing.IdentifiedObject#getRemarks() remarks}) that are not needed
- * for the purpose of handling XML {@code id}, {@code uuid} or {@code href} attributes.
+ * for the purpose of handling XML {@code id}, {@code uuid} or {@code href} attributes.</p>
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.18)
@@ -72,7 +72,7 @@ public interface IdentifiedObject {
* Returns all identifiers associated to this object. Each {@linkplain Identifier#getCode()
* identifier code} shall be unique in the {@linkplain Identifier#getAuthority() identifier
* authority} name space. Examples of namespace are:
- * <p>
+ *
* <ul>
* <li>{@linkplain org.apache.sis.metadata.iso.citation.Citations#EPSG EPSG} codes</li>
* <li><cite>Universal Product Code</cite> (UPC)</li>
@@ -87,8 +87,8 @@ public interface IdentifiedObject {
* {@code show} and {@code actuate} attributes)</li>
* </ul>
*
- * <p>Note that XML ID attribute are actually unique only in the scope of the XML document
- * being processed.</p>
+ * Note that XML ID attribute are actually unique only in the scope of the XML document
+ * being processed.
*
* @return All identifiers associated to this object, or an empty collection if none.
*
@@ -109,6 +109,7 @@ public interface IdentifiedObject {
*
* <p>There is usually a one-to-one relationship between the map entries and the identifier
* elements, but not always:</p>
+ *
* <ul>
* <li>The map view may contain less entries, because the map interface allows only one
* entry per authority. If the {@linkplain #getIdentifiers() identifier collection} contains
@@ -121,8 +122,8 @@ public interface IdentifiedObject {
* view may choose to unify all those attributes in a single view.</li>
* </ul>
*
- * <p>The map supports {@link IdentifierMap#put(Object, Object) put} operations
- * if and only if this {@code IdentifiedObject} is modifiable.</p>
+ * The map supports {@link IdentifierMap#put(Object, Object) put} operations
+ * if and only if this {@code IdentifiedObject} is modifiable.
*
* @return The identifiers as a map of (<var>authority</var>, <var>code</var>) entries,
* or an empty map if none.
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierMap.java Sat Oct 20 06:23:24 2012
@@ -27,12 +27,12 @@ import org.opengis.metadata.citation.Cit
* {@linkplain java.util.Map.Entry#getKey() key} is the {@linkplain Identifier#getAuthority()
* identifier authority} and the {@linkplain java.util.Map.Entry#getValue() value} is the
* {@linkplain Identifier#getCode() identifier code}.
- * <p>
- * Some XML identifiers are difficult to handle as {@link Identifier}Â objects. Those identifiers are
+ *
+ * <p>Some XML identifiers are difficult to handle as {@link Identifier}Â objects. Those identifiers are
* rather handled using specialized classes like {@link XLink}. This {@code IdentifierMap} interface
* mirrors the standard {@link Map#get(Object) get} and {@link Map#put(Object, Object) put} methods
* with specialized methods, in order to fetch and store identifiers as objects of the specialized
- * class.
+ * class.</p>
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.19)
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/IdentifierSpace.java Sat Oct 20 06:23:24 2012
@@ -100,7 +100,7 @@ public interface IdentifierSpace<T> exte
/**
* Returns the name of this identifier space.
- * <p>
+ *
* <ul>
* <li>For the constants defined in this {@code IdentifierSpace} interface, this is
* the XML attribute name with its prefix. Attribute names can be {@code "gml:id"},
Modified: sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java (original)
+++ sis/branches/JDK6/sis-utility/src/main/java/org/apache/sis/xml/XLink.java Sat Oct 20 06:23:24 2012
@@ -292,7 +292,7 @@ public class XLink implements Serializab
/**
* A bitmask which specified the non-null fields expected for a given type.
* The bit values are:
- * <p>
+ *
* <ul>
* <li>{@code type}: 0x1</li>
* <li>{@code href}: 0x2</li>
@@ -345,7 +345,7 @@ public class XLink implements Serializab
/**
* Returns the type of link. May have one of the following values:
- * <p>
+ *
* <ul>
* <li><b>simple:</b> a simple link</li>
* <li><b>extended:</b> an extended, possibly multi-resource, link</li>
@@ -355,9 +355,9 @@ public class XLink implements Serializab
* <li><b>title:</b> a descriptive title for another linking element</li>
* </ul>
*
- * <p>The default value is {@code null}. If the {@link #setType(XLink.Type)} method has been
+ * The default value is {@code null}. If the {@link #setType(XLink.Type)} method has been
* invoked with the {@link org.apache.sis.xml.XLink.Type#AUTO AUTO} enum, then this method
- * will infer a type from the attributes having a non-null value.</p>
+ * will infer a type from the attributes having a non-null value.
*
* @return The type of link, or {@code null}.
*/
@@ -440,8 +440,8 @@ public class XLink implements Serializab
* identifier.
*
* {@note This serves a role similar to <code>idref</code>. The <code>idref</code>
- * attribute allows an XML element to refer to another XML element that has a
- * corresponding <code>id</code> attribute.}
+ * attribute allows an XML element to refer to another XML element that has
+ * a corresponding <code>id</code> attribute.}
*
* @return A URN to a resources, or {@code null}Â if none.
*
@@ -591,7 +591,7 @@ public class XLink implements Serializab
/**
* Returns the desired presentation of the ending resource on traversal
* from the starting resource. It's value should be treated as follows:
- * <p>
+ *
* <ul>
* <li><b>new:</b> load ending resource in a new window, frame, pane, or other presentation context</li>
* <li><b>replace:</b> load the resource in the same window, frame, pane, or other presentation context</li>
@@ -662,7 +662,7 @@ public class XLink implements Serializab
/**
* Returns the desired timing of traversal from the starting resource to the ending
* resource. It's value should be treated as follows:
- * <p>
+ *
* <ul>
* <li><b>onLoad:</b> traverse to the ending resource immediately on loading the starting resource</li>
* <li><b>onRequest:</b> traverse from the starting resource to the ending resource only on a post-loading event triggered for this purpose</li>
@@ -781,8 +781,8 @@ public class XLink implements Serializab
/**
* Marks this {@code xlink} as unmodifiable. After this method call, any call to a setter
* method will throw an {@link UnsupportedOperationException}.
- * <p>
- * After the first call to this method, any subsequent calls have no effect.
+ *
+ * <p>After the first call to this method, any subsequent calls have no effect.</p>
*/
public synchronized void freeze() {
if (hashCode == 0) {
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java Sat Oct 20 06:23:24 2012
@@ -75,8 +75,8 @@ public strictfp class IdentifierMapAdapt
/**
* Tests read and write operations on an {@link IdentifierMapAdapter}, using a well-formed
* identifier collection (no null values, no duplicated authorities).
- * <p>
- * This test does not use the {@link IdentifierMap}-specific API.
+ *
+ * <p>This test does not use the {@link IdentifierMap}-specific API.</p>
*/
@Test
public void testGetAndPut() {
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/util/ReferenceQueueConsumerTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/util/ReferenceQueueConsumerTest.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/util/ReferenceQueueConsumerTest.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/internal/util/ReferenceQueueConsumerTest.java Sat Oct 20 06:23:24 2012
@@ -37,9 +37,9 @@ public final strictfp class ReferenceQue
* to be thrown even if invoked <em>before</em> {@link ReferenceQueue#remove()} put the
* thread in a waiting state. This behavior is documented in {@link Object#wait()}, but
* the reference queue javadoc is silent on this topic.
- * <p>
- * This method is not a test of the SIS library, but rather a verification of our JDK
- * library interpretation.
+ *
+ * <p>This method is not a test of the SIS library, but rather a verification of our JDK
+ * library interpretation.</p>
*
* @throws InterruptedException This is the excepted exception.
*/
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/Assert.java Sat Oct 20 06:23:24 2012
@@ -188,7 +188,7 @@ public strictfp class Assert extends org
/**
* Parses two XML tree as DOM documents, and compares the nodes.
* The inputs given to this method can be any of the following types:
- * <p>
+ *
* <ul>
* <li>{@link org.w3c.dom.Node}: used directly without further processing.</li>
* <li>{@link java.io.File}, {@link java.net.URL} or {@link java.net.URI}: the
@@ -197,7 +197,7 @@ public strictfp class Assert extends org
* Encoding <strong>must</strong> be UTF-8 (no other encoding is supported
* by current implementation of this method).</li>
* </ul>
- * <p>
+ *
* This method will ignore comments and the optional attributes given in arguments.
*
* @param expected The expected XML document.
@@ -254,9 +254,9 @@ public strictfp class Assert extends org
* Tests if the given {@code outer} shape contains the given {@code inner} rectangle.
* This method will also verify class consistency by invoking the {@code intersects}
* method, and by interchanging the arguments.
- * <p>
- * This method can be used for testing the {@code outer} implementation -
- * it should not be needed for standard JDK implementations.
+ *
+ * <p>This method can be used for testing the {@code outer} implementation -
+ * it should not be needed for standard JDK implementations.</p>
*
* @param outer The shape which is expected to contains the given rectangle.
* @param inner The rectangle which should be contained by the shape.
@@ -276,9 +276,9 @@ public strictfp class Assert extends org
* Tests if the given {@code r1} shape is disjoint with the given {@code r2} rectangle.
* This method will also verify class consistency by invoking the {@code contains}
* method, and by interchanging the arguments.
- * <p>
- * This method can be used for testing the {@code r1} implementation -
- * it should not be needed for standard implementations.
+ *
+ * <p>This method can be used for testing the {@code r1} implementation - it should not
+ * be needed for standard implementations.</p>
*
* @param r1 The first shape to test.
* @param r2 The second rectangle to test.
@@ -345,9 +345,9 @@ public strictfp class Assert extends org
/**
* Serializes the given object in memory, deserialize it and ensures that the deserialized
* object is equals to the original one. This method doesn't write anything to the disk.
- * <p>
- * If the serialization fails, then this method thrown an {@link AssertionError}
- * as do the other JUnit assertion methods.
+ *
+ * <p>If the serialization fails, then this method thrown an {@link AssertionError}
+ * as do the other JUnit assertion methods.</p>
*
* @param <T> The type of the object to serialize.
* @param object The object to serialize.
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestCase.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestCase.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestCase.java Sat Oct 20 06:23:24 2012
@@ -41,12 +41,12 @@ import static org.apache.sis.test.TestCo
* field shall be used instead of {@link System#out} for the following reasons:
*
* <ul>
- * <li><p>It is {@code null} by default and enabled only if a system property is set as
+ * <li>It is {@code null} by default and enabled only if a system property is set as
* described in the {@linkplain org.apache.sis.test package javadoc}. This allows more
- * quiet (and sometime faster) Maven executions for those who are not SIS developers.</p></li>
- * <li><p>The outputs are collected and printed only after each test completion.
+ * quiet (and sometime faster) Maven executions for those who are not SIS developers.</li>
+ * <li>The outputs are collected and printed only after each test completion.
* This avoid the problem of logging messages interleaved with the output.
- * If such interleaving is really wanted, then use the logging framework instead.</p></li>
+ * If such interleaving is really wanted, then use the logging framework instead.</li>
* </ul>
*
* Usage example:
@@ -99,9 +99,9 @@ public abstract strictfp class TestCase
* Note that we look specifically for {@link ConsoleHandler}; we do not generalize to
* {@link StreamHandler} because the log files may not be intended for being show in
* the console.
- * <p>
- * In case of failure to use the given encoding, we will just print a short error
- * message and left the encoding unchanged.
+ *
+ * <p>In case of failure to use the given encoding, we will just print a short error
+ * message and left the encoding unchanged.</p>
*/
static {
final String encoding = System.getProperty(OUTPUT_ENCODING_KEY);
@@ -131,10 +131,10 @@ public abstract strictfp class TestCase
* If verbose output is enabled, flushes the {@link #out} stream after each test.
* The stream will be flushed to the {@linkplain System#console() console} if
* available, or to the {@linkplain System#out standard output stream} otherwise.
- * <p>
- * This method is invoked automatically by JUnit and doesn't need to be invoked
+ *
+ * <p>This method is invoked automatically by JUnit and doesn't need to be invoked
* explicitely, unless the developer wants to flush the output at some specific
- * point.
+ * point.</p>
*/
@After
public void flushVerboseOutput() {
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestRunner.java Sat Oct 20 06:23:24 2012
@@ -45,11 +45,11 @@ import static org.apache.sis.util.collec
/**
* The SIS test runner for individual classes.
* This class extends the JUnit standard test runner with additional features:
- * <p>
+ *
* <ul>
* <li>Support of the {@link DependsOn} and {@link DependsOnMethod} annotations.</li>
* </ul>
- * <p>
+ *
* This runner is not designed for parallel execution of tests.
*
* @author Stephen Connolly
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java Sat Oct 20 06:23:24 2012
@@ -157,11 +157,11 @@ public final strictfp class TestUtilitie
/**
* Waits up to one second for the garbage collector to do its work. This method can be invoked
* only if {@link TestConfiguration#allowGarbageCollectorDependentTests()} returns {@code true}.
- * <p>
- * Note that this method does not throw any exception if the given condition has not been
+ *
+ * <p>Note that this method does not throw any exception if the given condition has not been
* reached before the timeout. Instead, it is the caller responsibility to test the return
* value. This method is designed that way because the caller can usually produce a more
- * accurate error message about which value has not been garbage collected as expected.
+ * accurate error message about which value has not been garbage collected as expected.</p>
*
* @param stopCondition A condition which return {@code true} if this method can stop waiting,
* or {@code false} if it needs to ask again for garbage collection.
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java Sat Oct 20 06:23:24 2012
@@ -54,11 +54,11 @@ import static org.apache.sis.util.Charac
* The two XML documents are specified at construction time. The comparison is performed
* by a call to the {@link #compare()} method. The execution is delegated to the various
* protected methods defined in this class, which can be overridden.
- * <p>
- * By default, this comparator expects the documents to contain the same elements and
+ *
+ * <p>By default, this comparator expects the documents to contain the same elements and
* the same attributes (but the order of attributes may be different). However it is
- * possible to:
- * <p>
+ * possible to:</p>
+ *
* <ul>
* <li>Specify attributes to ignore in comparisons (see {@link #ignoredAttributes})</li>
* </ul>
@@ -89,9 +89,9 @@ public strictfp class XMLComparator {
* The fully-qualified name of attributes to ignore in comparisons. The name shall be in
* the form {@code "namespace:name"}, or only {@code "name"} if there is no namespace.
* In order to ignore everything in a namespace, use {@code "namespace:*"}.
- * <p>
- * For example in order to ignore the namespace, type and schema location declaration,
- * the following strings can be added in this set:
+ *
+ * <p>For example in order to ignore the namespace, type and schema location declaration,
+ * the following strings can be added in this set:</p>
*
* {@preformat text
* "xmlns:*", "xsi:schemaLocation", "xsi:type"
@@ -107,14 +107,14 @@ public strictfp class XMLComparator {
* The fully-qualified name of nodes to ignore in comparisons. The name shall be in the form
* {@code "namespace:name"}, or only {@code "name"} if there is no namespace. In order to
* ignore everything in a namespace, use {@code "namespace:*"}.
- * <p>
- * This set provides a way to ignore a node of the given name <em>and all its children</em>.
+ *
+ * <p>This set provides a way to ignore a node of the given name <em>and all its children</em>.
* In order to ignore a node but still compare its children, override the
- * {@link #compareNode(Node, Node)} method instead.
- * <p>
- * This set is initially empty. Users can add or remove elements in this set as they wish.
+ * {@link #compareNode(Node, Node)} method instead.</p>
+ *
+ * <p>This set is initially empty. Users can add or remove elements in this set as they wish.
* The content of this set will be honored by the default {@link #compareChildren(Node, Node)}
- * implementation.
+ * implementation.</p>
*/
public final Set<String> ignoredNodes;
@@ -142,7 +142,7 @@ public strictfp class XMLComparator {
/**
* Creates a new comparator for the given inputs.
* The inputs can be any of the following types:
- * <p>
+ *
* <ul>
* <li>{@link Node}; used directly without further processing.</li>
* <li>{@link File}, {@link URL} or {@link URI}: the stream is opened and parsed
@@ -209,7 +209,7 @@ public strictfp class XMLComparator {
/**
* Compares the two given nodes. This method delegates to one of the given methods depending
* on the expected node type:
- * <p>
+ *
* <ul>
* <li>{@link #compareCDATASectionNode(CDATASection, Node)}</li>
* <li>{@link #compareTextNode(Text, Node)}</li>
@@ -218,7 +218,7 @@ public strictfp class XMLComparator {
* <li>For all other types, {@link #compareNames(Node, Node)} and
* {@link #compareAttributes(Node, Node)}</li>
* </ul>
- * <p>
+ *
* Then this method invokes itself recursively for every children,
* by a call to {@link #compareChildren(Node, Node)}.
*
@@ -259,8 +259,8 @@ public strictfp class XMLComparator {
* Compares a node which is expected to be of {@link Text} type. The default implementation
* ensures that the given node is an instance of {@link Text}, then ensures that both nodes
* have the same names, attributes and text content.
- * <p>
- * Subclasses can override this method if they need a different processing.
+ *
+ * <p>Subclasses can override this method if they need a different processing.</p>
*
* @param expected The expected node.
* @param actual The actual node.
@@ -276,8 +276,8 @@ public strictfp class XMLComparator {
* Compares a node which is expected to be of {@link CDATASection} type. The default
* implementation ensures that the given node is an instance of {@link CDATASection},
* then ensures that both nodes have the same names, attributes and text content.
- * <p>
- * Subclasses can override this method if they need a different processing.
+ *
+ * <p>Subclasses can override this method if they need a different processing.</p>
*
* @param expected The expected node.
* @param actual The actual node.
@@ -293,8 +293,8 @@ public strictfp class XMLComparator {
* Compares a node which is expected to be of {@link Comment} type. The default
* implementation ensures that the given node is an instance of {@link Comment},
* then ensures that both nodes have the same names, attributes and text content.
- * <p>
- * Subclasses can override this method if they need a different processing.
+ *
+ * <p>Subclasses can override this method if they need a different processing.</p>
*
* @param expected The expected node.
* @param actual The actual node.
@@ -310,8 +310,8 @@ public strictfp class XMLComparator {
* Compares a node which is expected to be of {@link ProcessingInstruction} type. The default
* implementation ensures that the given node is an instance of {@link ProcessingInstruction},
* then ensures that both nodes have the same names, attributes and text content.
- * <p>
- * Subclasses can override this method if they need a different processing.
+ *
+ * <p>Subclasses can override this method if they need a different processing.</p>
*
* @param expected The expected node.
* @param actual The actual node.
@@ -327,8 +327,8 @@ public strictfp class XMLComparator {
* Compares a node which is expected to be of {@link Attr} type. The default
* implementation ensures that the given node is an instance of {@link Attr},
* then ensures that both nodes have the same names and text content.
- * <p>
- * Subclasses can override this method if they need a different processing.
+ *
+ * <p>Subclasses can override this method if they need a different processing.</p>
*
* @param expected The expected node.
* @param actual The actual node.
@@ -344,8 +344,8 @@ public strictfp class XMLComparator {
* Compares the children of the given nodes. The node themselves are not compared.
* Children shall appear in the same order. Nodes having a name declared in the
* {@link #ignoredNodes} set are ignored.
- * <p>
- * Subclasses can override this method if they need a different processing.
+ *
+ * <p>Subclasses can override this method if they need a different processing.</p>
*
* @param expected The expected node.
* @param actual The node for which to compare children.
@@ -378,12 +378,12 @@ public strictfp class XMLComparator {
/**
* Compares the attributes of the given nodes.
* Subclasses can override this method if they need a different comparison.
- * <p>
- * <strong>NOTE:</strong> Current implementation requires the number of attributes to be the
+ *
+ * <p><strong>NOTE:</strong> Current implementation requires the number of attributes to be the
* same only if the {@link #ignoredAttributes} set is empty. If the {@code ignoredAttributes}
* set is not empty, then the actual node could have more attributes than the expected node;
* the extra attributes are ignored. This may change in a future version if it appears to be
- * a problem in practice.
+ * a problem in practice.</p>
*
* @param expected The node having the expected attributes.
* @param actual The node to compare.
@@ -580,8 +580,8 @@ public strictfp class XMLComparator {
* Appends to the given buffer the string representation of the node hierarchy.
* The first line will contains the root of the tree. Other lines will contain
* the child down in the hierarchy until the given node, inclusive.
- * <p>
- * This method formats only a summary if the hierarchy is equals to the expected one.
+ *
+ * <p>This method formats only a summary if the hierarchy is equals to the expected one.</p>
*
* @param buffer The buffer in which to append the formatted hierarchy.
* @param node The node for which to format the parents.
Modified: sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/package-info.java?rev=1400377&r1=1400376&r2=1400377&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/package-info.java (original)
+++ sis/branches/JDK6/sis-utility/src/test/java/org/apache/sis/test/package-info.java Sat Oct 20 06:23:24 2012
@@ -28,16 +28,16 @@
* from the command line by defining {@linkplain java.lang.System#getProperties() system properties}
* values like below:
*
- * <ul>
- * <li><p><b><code>-Dorg.apache.sis.test.verbose=true</code></b><br>
+ * <ul class="verbose">
+ * <li><b>{@code -Dorg.apache.sis.test.verbose=true}</b><br>
* For enabling verbose outputs to the {@linkplain java.lang.System#console() console} if any,
- * or to the {@linkplain java.lang.System#out standard output stream} otherwise.</p></li>
+ * or to the {@linkplain java.lang.System#out standard output stream} otherwise.</li>
*
- * <li><p><b><code>-Dorg.apache.sis.test.encoding=UTF-8</code></b> (or any other valid encoding name)<br>
+ * <li><b>{@code -Dorg.apache.sis.test.encoding=UTF-8}</b> (or any other valid encoding name)<br>
* For the encoding of the above-cited verbose output, and the encoding of logging messages
* sent to the {@linkplain java.util.logging.ConsoleHandler console handler}.
* This is useful on Windows or MacOS platforms having a console encoding different than the
- * platform encoding. If omitted, then the platform encoding will be used.</p></li>
+ * platform encoding. If omitted, then the platform encoding will be used.</li>
* </ul>
*
* @author Martin Desruisseaux (Geomatys)