Author: desruisseaux
Date: Fri Mar 20 12:10:46 2015
New Revision: 1667993
URL: http://svn.apache.org/r1667993
Log:
Javadoc: fixed a bug in our stylesheet, and removed some <p> elements which are
no longer needed after this fix.
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
sis/branches/JDK8/src/main/javadoc/stylesheet.css
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
[UTF-8] Fri Mar 20 12:10:46 2015
@@ -43,18 +43,18 @@ import static org.apache.sis.util.Argume
* version and cardinality are left unchanged because they may be shared by
many parameters.
*
* <ul>
- * <li><p><b>{@linkplain DefaultParameterDescriptor#getName() Names}:</b>
+ * <li><b>{@linkplain DefaultParameterDescriptor#getName() Names}:</b>
* each parameter must have a name, which can be specified by any of the
{@link #addName(CharSequence)
* addName(…)} methods. Parameters can optionally have an arbitrary amount
of aliases, which are also specified
- * by the {@code addName(…)} methods. Each call after the first one adds an
alias.</p></li>
+ * by the {@code addName(…)} methods. Each call after the first one adds an
alias.</li>
*
- * <li><p><b>{@linkplain DefaultParameterDescriptor#getIdentifiers()
Identifiers}:</b>
+ * <li><b>{@linkplain DefaultParameterDescriptor#getIdentifiers()
Identifiers}:</b>
* parameters can also have an arbitrary amount of identifiers, which are
specified by any of the
* {@link #addIdentifier(String) addIdentifier(…)} methods. Like names, more
than one identifier can be
- * added by invoking the method many time.</p></li>
+ * added by invoking the method many time.</li>
*
- * <li><p><b>{@linkplain DefaultParameterDescriptor#getRemarks()
Remarks}:</b>
- * parameters can have at most one remark, which is specified by the {@code
setRemarks(…)} method.</p></li>
+ * <li><b>{@linkplain DefaultParameterDescriptor#getRemarks() Remarks}:</b>
+ * parameters can have at most one remark, which is specified by the {@code
setRemarks(…)} method.</li>
* </ul>
*
*
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
[UTF-8] Fri Mar 20 12:10:46 2015
@@ -48,58 +48,58 @@ import java.util.Objects;
* <p>This base class provides methods for defining the {@link
IdentifiedObject} properties shown below:</p>
*
* <ul>
- * <li><p><b>{@linkplain AbstractIdentifiedObject#getName() Name}:</b>
+ * <li><b>{@linkplain AbstractIdentifiedObject#getName() Name}:</b>
* each {@code IdentifiedObject} shall have a name, which can be
specified by a call to any of the
- * {@link #addName(CharSequence) addName(…)} methods defined in this
class.</p></li>
+ * {@link #addName(CharSequence) addName(…)} methods defined in this
class.</li>
*
- * <li><p><b>{@linkplain AbstractIdentifiedObject#getAlias() Aliases}:</b>
+ * <li><b>{@linkplain AbstractIdentifiedObject#getAlias() Aliases}:</b>
* identified objects can optionally have an arbitrary amount of
aliases, which are also specified
- * by the {@code addName(…)} methods. Each call after the first one adds
an alias.</p></li>
+ * by the {@code addName(…)} methods. Each call after the first one adds
an alias.</li>
*
- * <li><p><b>{@linkplain AbstractIdentifiedObject#getIdentifiers()
Identifiers}:</b>
+ * <li><b>{@linkplain AbstractIdentifiedObject#getIdentifiers()
Identifiers}:</b>
* identified objects can also have an arbitrary amount of identifiers,
which are specified by any
* of the {@link #addIdentifier(String) addIdentifier(…)} methods. Like
names, more than one identifier
- * can be added by invoking the method many time.</p></li>
+ * can be added by invoking the method many time.</li>
*
- * <li><p><b>{@linkplain AbstractIdentifiedObject#getRemarks() Remarks}:</b>
+ * <li><b>{@linkplain AbstractIdentifiedObject#getRemarks() Remarks}:</b>
* identified objects can have at most one remark, which is specified by
the {@code setRemarks(…)}
- * method.</p></li>
+ * method.</li>
* </ul>
*
* The names and identifiers cited in the above table can be built from {@link
CharSequence} given to the
* {@code addName(…)} or {@code addIdentifier(…)} methods combined with the
following properties:
*
* <ul>
- * <li><p><b>{@linkplain ImmutableIdentifier#getCodeSpace() Code space}:</b>
+ * <li><b>{@linkplain ImmutableIdentifier#getCodeSpace() Code space}:</b>
* each {@code Identifier} name or code can be local to a code space
defined by an authority.
* Both the authority and code space can be specified by the {@link
#setCodeSpace(Citation, String)} method,
- * and usually (but not necessarily) apply to all {@code Identifier}
instances.</p></li>
+ * and usually (but not necessarily) apply to all {@code Identifier}
instances.</li>
*
- * <li><p><b>{@linkplain ImmutableIdentifier#getVersion() Version}:</b>
+ * <li><b>{@linkplain ImmutableIdentifier#getVersion() Version}:</b>
* identifiers can optionally have a version specified by the {@link
#setVersion(String)} method.
- * The version usually (but not necessarily) applies to all {@code
Identifier} instances.</p></li>
+ * The version usually (but not necessarily) applies to all {@code
Identifier} instances.</li>
*
- * <li><p><b>{@linkplain ImmutableIdentifier#getDescription()
Description}:</b>
+ * <li><b>{@linkplain ImmutableIdentifier#getDescription() Description}:</b>
* identifiers can optionally have a description specified by the {@link
#setDescription(CharSequence)} method.
- * The description applies only to the next identifier to
create.</p></li>
+ * The description applies only to the next identifier to create.</li>
* </ul>
*
* {@section Namespaces and scopes}
* The {@code addName(…)} and {@code addIdentifier(…)} methods come in three
flavors:
* <ul>
- * <li><p>The {@link #addIdentifier(String)} and {@link
#addName(CharSequence)} methods combine the given argument
+ * <li>The {@link #addIdentifier(String)} and {@link #addName(CharSequence)}
methods combine the given argument
* with the above-cited authority, code space, version and description
information.
* The result is a {@linkplain org.apache.sis.util.iso.DefaultLocalName
local name} or identifier,
- * in which the code space information is stored but not shown by the
{@code toString()} method.</p></li>
+ * in which the code space information is stored but not shown by the
{@code toString()} method.</li>
*
- * <li><p>The {@link #addIdentifier(Citation, String)} and {@link
#addName(Citation, CharSequence)} methods use the given
+ * <li>The {@link #addIdentifier(Citation, String)} and {@link
#addName(Citation, CharSequence)} methods use the given
* {@link Citation} argument, ignoring any authority or code space
information given to this {@code Builder}.
* The result is a {@linkplain org.apache.sis.util.iso.DefaultScopedName
scoped name} or identifier,
- * in which the code space information is shown by the {@code
toString()} method.</p></li>
+ * in which the code space information is shown by the {@code
toString()} method.</li>
*
- * <li><p>The {@link #addIdentifier(Identifier)}, {@link
#addName(Identifier)} and {@link #addName(GenericName)}
+ * <li>The {@link #addIdentifier(Identifier)}, {@link #addName(Identifier)}
and {@link #addName(GenericName)}
* methods take the given object <cite>as-is</cite>. Any authority, code
space, version or description
- * information given to the {@code Builder} are ignored.</p></li>
+ * information given to the {@code Builder} are ignored.</li>
* </ul>
*
* <div class="note"><b>Example:</b>
@@ -131,21 +131,20 @@ import java.util.Objects;
* In order to simplify that common usage, two groups of properties have
different lifetimes in the {@code Builder} class:
*
* <ul>
- * <li><p>
- * {@linkplain NamedIdentifier#getAuthority() Authority},
- * {@linkplain NamedIdentifier#getCodeSpace() code space} and
- * {@linkplain NamedIdentifier#getVersion() version}:<br>
- * Kept until they are specified again, because those properties are
typically shared by all components.
- * </p></li>
- * <li><p>
- * {@linkplain AbstractIdentifiedObject#getName() Name},
- * {@linkplain AbstractIdentifiedObject#getAlias() aliases},
- * {@linkplain AbstractIdentifiedObject#getIdentifiers() identifiers},
- * {@linkplain ImmutableIdentifier#getDescription() description} and
- * {@linkplain AbstractIdentifiedObject#getRemarks() remarks}:<br>
- * Cleared after each call to a {@code createXXX(…)} method, because
those properties are usually specific
- * to a particular {@code IdentifiedObject} or {@code Identifier}
instance.
- * </p></li>
+ * <li>
+ * {@linkplain NamedIdentifier#getAuthority() Authority},
+ * {@linkplain NamedIdentifier#getCodeSpace() code space} and
+ * {@linkplain NamedIdentifier#getVersion() version}:<br>
+ * Kept until they are specified again, because those properties are
typically shared by all components.
+ * </li><li>
+ * {@linkplain AbstractIdentifiedObject#getName() Name},
+ * {@linkplain AbstractIdentifiedObject#getAlias() aliases},
+ * {@linkplain AbstractIdentifiedObject#getIdentifiers() identifiers},
+ * {@linkplain ImmutableIdentifier#getDescription() description} and
+ * {@linkplain AbstractIdentifiedObject#getRemarks() remarks}:<br>
+ * Cleared after each call to a {@code createXXX(…)} method, because those
properties are usually specific
+ * to a particular {@code IdentifiedObject} or {@code Identifier} instance.
+ * </li>
* </ul>
*
* {@section Usage examples}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/IdentifiedObjects.java
[UTF-8] Fri Mar 20 12:10:46 2015
@@ -118,18 +118,18 @@ public final class IdentifiedObjects ext
* then all {@linkplain AbstractIdentifiedObject#getAlias() aliases} in
their iteration order.
*
* <ul>
- * <li><p>If the name or alias implements the {@link Identifier}
interface,
+ * <li>If the name or alias implements the {@link Identifier} interface,
* then this method compares the {@linkplain
Identifier#getAuthority()
* identifier authority} against the specified citation using the
* {@link Citations#identifierMatches(Citation, Citation)} method.
* If a matching is found, then this method returns the
- * {@linkplain Identifier#getCode() identifier code} of that
object.</p></li>
+ * {@linkplain Identifier#getCode() identifier code} of that
object.</li>
*
- * <li><p>Otherwise, if the alias implements the {@link GenericName}
interface, then this method
+ * <li>Otherwise, if the alias implements the {@link GenericName}
interface, then this method
* compares the {@linkplain GenericName#scope() name scope} against
the specified citation
* using the {@link Citations#identifierMatches(Citation, String)}
method.
* If a matching is found, then this method returns the
- * {@linkplain GenericName#tip() name tip} of that object.</p></li>
+ * {@linkplain GenericName#tip() name tip} of that object.</li>
* </ul>
*
* Note that alias may implement both the {@link Identifier} and {@link
GenericName}
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
[UTF-8] Fri Mar 20 12:10:46 2015
@@ -374,21 +374,21 @@ public class DefaultOperationMethod exte
* The need to change an {@code OperationMethod} dimensionality may occur
in two contexts:
*
* <ul>
- * <li><p>When the original method can work with any number of
dimensions. Those methods do not know
+ * <li>When the original method can work with any number of dimensions.
Those methods do not know
* in advance the number of dimensions, which is fixed only after the
actual {@link MathTransform}
* instance has been created.
- * Example: <cite>Affine</cite> conversion.</p></li>
- * <li><p>When a three-dimensional method can also be used in the
two-dimensional case, typically by
+ * Example: <cite>Affine</cite> conversion.</li>
+ * <li>When a three-dimensional method can also be used in the
two-dimensional case, typically by
* assuming that the ellipsoidal height is zero everywhere.
- * Example: <cite>Molodensky</cite> transform.</p></li>
+ * Example: <cite>Molodensky</cite> transform.</li>
* </ul>
*
* This {@code redimension(…)} implementation performs the following
choice:
*
* <ul>
- * <li><p>If the given method is an instance of {@code
DefaultOperationMethod}, then delegate to
+ * <li>If the given method is an instance of {@code
DefaultOperationMethod}, then delegate to
* {@link #redimension(int, int)} in order to allow subclasses to
defines their own policy.
- * For example the <cite>Molodensky</cite> method needs to
override.</p></li>
+ * For example the <cite>Molodensky</cite> method needs to
override.</li>
* <li>Otherwise for each dimension (<var>source</var> and
<var>target</var>):
* <ul>
* <li>If the corresponding dimension of the given method is {@code
null}, then
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
[UTF-8] Fri Mar 20 12:10:46 2015
@@ -31,14 +31,14 @@ import org.apache.sis.internal.system.Mo
* This class serves two purposes:
*
* <ul>
- * <li><p>Fetch the list of converters from the content of all
+ * <li>Fetch the list of converters from the content of all
* {@code
META-INF/services/org.apache.sis.util.converter.ObjectConverter} files found on
the classpath.
- * The intend is to allow other modules to register their own
converters.</p></li>
+ * The intend is to allow other modules to register their own
converters.</li>
*
- * <li><p>Apply heuristic rules in addition to the explicitly registered
converters.
+ * <li>Apply heuristic rules in addition to the explicitly registered
converters.
* Those heuristic rules are provided in a separated class in order to
keep the
* {@link ConverterRegistry} class a little bit more "pure", and
concentrate
- * most arbitrary decisions in this single class.</p></li>
+ * most arbitrary decisions in this single class.</li>
* </ul>
*
* When using {@code SystemRegistry}, new converters may "automagically"
appear as a consequence
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
[UTF-8] Fri Mar 20 12:10:46 2015
@@ -29,16 +29,16 @@
* <p>This package includes:</p>
*
* <ul>
- * <li><p>JAXB adapters for primitive types.
+ * <li>JAXB adapters for primitive types.
* JAXB can write directly Java primitive type at marshalling time "as is".
However ISO-19139
* requires those values to be surrounded by elements representing the data
type. The role of
- * these adapters is to add these elements around the value.</p></li>
+ * these adapters is to add these elements around the value.</li>
*
- * <li><p>JAXB adapters for <cite>unit of measure</cite> as specified in the
ISO-19103
+ * <li>JAXB adapters for <cite>unit of measure</cite> as specified in the
ISO-19103
* specifications. For example, a measure marshalled with JAXB will be
formatted like
- * {@code <gco:Measure uom="m">220.0</gco:Measure>}.</p></li>
+ * {@code <gco:Measure uom="m">220.0</gco:Measure>}.</li>
*
- * <li><p>JAXB adapters for date and time.</p></li>
+ * <li>JAXB adapters for date and time.</li>
* </ul>
*
* Classes prefixed by two letters, like {@code "GO_Decimal"}, are also
wrappers around the actual
Modified:
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
[UTF-8] Fri Mar 20 12:10:46 2015
@@ -351,8 +351,8 @@ public final class NilReason implements
* The {@code type} argument can be one of the following cases:
*
* <ul>
- * <li><p>An <strong>interface</strong>: in such case, this method
returns an object which implement the given
- * interface together with the {@link NilObject} and {@link
LenientComparable} interfaces:</p>
+ * <li>An <strong>interface</strong>: in such case, this method returns
an object which implement the given
+ * interface together with the {@link NilObject} and {@link
LenientComparable} interfaces:
* <ul>
* <li>The {@link NilObject#getNilReason()} method will return
this {@code NilReason} instance.</li>
* <li>The {@code equals(…)} and {@code hashCode()} methods behave
as documented in {@link LenientComparable}.</li>
@@ -361,9 +361,9 @@ public final class NilReason implements
* {@code 0} or {@code false}, in this preference order,
depending on the method return type.</li>
* </ul>
* </li>
- * <li><p>One of {@code Boolean}, {@link Byte}, {@link Short}, {@code
Integer}, {@link Long}, {@link Float},
+ * <li>One of {@code Boolean}, {@link Byte}, {@link Short}, {@code
Integer}, {@link Long}, {@link Float},
* {@code Double} or {@code String} types: in such case, this method
returns a specific instance which
- * will be recognized as "nil" by the XML marshaller.</p></li>
+ * will be recognized as "nil" by the XML marshaller.</li>
* </ul>
*
* @param <T> The compile-time type of the {@code type} argument.
Modified: sis/branches/JDK8/src/main/javadoc/stylesheet.css
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/src/main/javadoc/stylesheet.css?rev=1667993&r1=1667992&r2=1667993&view=diff
==============================================================================
--- sis/branches/JDK8/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/JDK8/src/main/javadoc/stylesheet.css Fri Mar 20 12:10:46 2015
@@ -176,8 +176,8 @@ div.block ol {
margin-bottom: 9px;
}
-div.block li > ul,
-div.block li > ol {
+div.block ul > li,
+div.block ol > li {
margin-top: 0;
margin-bottom: 6px;
}
