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 2015/03/31 23:30:10 UTC
svn commit: r1670485 [12/12] - in /sis/branches/JDK6: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-webapp/src/main/java/org/apache/sis/services/
core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ cor...
Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Tue Mar 31 21:30:06 2015
@@ -132,7 +132,7 @@ run.test.classpath=\
${maven.repository}/edu/ucar/udunits/${netcdf.version}/udunits-${netcdf.version}.jar:\
${maven.repository}/edu/ucar/httpservices/${netcdf.version}/httpservices-${netcdf.version}.jar:\
${maven.repository}/joda-time/joda-time/${joda-time.version}/joda-time-${joda-time.version}.jar:\
- ${maven.repository}/commons-httpclient/commons-httpclient/${httpclient.version}/commons-httpclient-${httpclient.version}.jar:\
+ ${maven.repository}/org/apache/httpcomponents/httpclient/${httpclient.version}/httpclient-${httpclient.version}.jar:\
${maven.repository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar:\
${maven.repository}/org/slf4j/slf4j-jdk14/${slf4j.version}/slf4j-jdk14-${slf4j.version}.jar
debug.classpath=\
Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Tue Mar 31 21:30:06 2015
@@ -667,7 +667,6 @@ Apache SIS is a free software, Java lang
</tags>
<taglets>
<taglet><tagletClass>org.apache.sis.internal.taglet.Module</tagletClass></taglet>
- <taglet><tagletClass>org.apache.sis.internal.taglet.Section</tagletClass></taglet>
<taglet><tagletClass>org.apache.sis.internal.taglet.Include</tagletClass></taglet>
<taglet><tagletClass>org.apache.sis.internal.taglet.Preformat</tagletClass></taglet>
</taglets>
Modified: sis/branches/JDK6/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/package-info.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/profiles/sis-french-profile/src/main/java/org/apache/sis/profile/france/package-info.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -18,7 +18,7 @@
/**
* French extensions defined by the <cite>Association Française de Normalisation</cite> (AFNOR).
*
- * {@section Historical note}
+ * <div class="section">Historical note</div>
* The French profile also added two properties to the ISO 19115:2003 standard.
* Equivalent properties have been added to the 2013 revision of ISO 19115,
* so the French profile should not be needed anymore except for compatibility with oldest specifications.
Modified: sis/branches/JDK6/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/javadoc/stylesheet.css?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/JDK6/src/main/javadoc/stylesheet.css Tue Mar 31 21:30:06 2015
@@ -152,18 +152,18 @@ div.warning:before {
/*
- * Formatting in the {@section} custom javadoc tag.
+ * Formatting of section headers
*/
-div.block h5 {
- font-size: 16px;
- margin-top: 30px;
- margin-bottom: 6px;
+div.section {
+ font-size: 15px;
+ font-weight: bold;
+ margin-top: 21px;
+ margin-bottom: 3px;
}
-div.block h6 {
- font-size: 16px;
- margin-top: 30px;
- margin-bottom: 6px;
+div.description div.section {
+ font-size: 18px;
+ margin-top: 30px;
}
/*
@@ -174,23 +174,54 @@ div.block ul,
div.block ol {
margin-top: 9px;
margin-bottom: 9px;
+ text-align: left;
}
-div.block li > ul,
-div.block li > ol {
+div.block ul > li,
+div.block ol > li {
margin-top: 0;
- margin-bottom: 6px;
+ margin-bottom: 3px;
}
-ul.verbose li {
- margin-top: 6px;
+div.block ul.verbose > li,
+div.block ol.verbose > li {
+ margin-top: 9px;
+ margin-bottom: 9px;
+ text-align: justify;
+}
+
+/*
+ * Reduce the space for sublists.
+ */
+div.block ul > li > ul,
+div.block ol > li > ul {
+ margin-top: 3px;
margin-bottom: 6px;
+ text-align: left;
}
+div.block ul > li > ul > li,
+div.block ol > li > ul > li {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+div.block center {
+ margin-top: 18px;
+ margin-bottom: 18px;
+}
+
+/*
+ * Miscellaneous.
+ */
span.deprecated {
text-decoration: line-through;
}
+div.block {
+ text-align: justify;
+}
+
/* ----------------------------------------------------------------------
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -43,7 +43,7 @@ public final class Axis {
* The indices of the grid dimension associated to this axis. Values in this array are sorted with more
* "significant" (defined below) dimensions first - this is not necessarily increasing order.
*
- * {@section Elements order}
+ * <div class="section">Elements order</div>
* The length of this array is often 1. But if more than one grid dimension is associated to this axis
* (i.e. if the wrapped NetCDF axis is an instance of {@link ucar.nc2.dataset.CoordinateAxis2D}), then
* the first index is what seems the most significant grid dimension (i.e. the dimension which seems
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -149,7 +149,7 @@ public abstract class Decoder implements
/**
* Converts the given numerical values to date, using the information provided in the given unit symbol.
- * The unit symbol is typically a string like "<cite>days since 1970-01-01T00:00:00Z</cite>".
+ * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
*
* @param symbol The temporal unit name or symbol, followed by the epoch.
* @param values The values to convert. May contains {@code null} elements.
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -34,7 +34,7 @@ public abstract class GridGeometry {
/**
* Returns the number of dimensions in the grid.
- * This is the number of dimensions of source coordinates in the "<cite>grid to CRS</cite>" transform.
+ * This is the number of dimensions of source coordinates in the <cite>"grid to CRS"</cite> transform.
*
* @return Number of grid dimensions.
*/
@@ -42,7 +42,7 @@ public abstract class GridGeometry {
/**
* Returns the number of dimensions in the coordinate reference system.
- * This is the number of dimensions of target coordinates in the "<cite>grid to CRS</cite>" transform.
+ * This is the number of dimensions of target coordinates in the <cite>"grid to CRS"</cite> transform.
* It should also be equal to the size of the list returned by {@link #getAxes()}.
*
* @return Number of CRS dimensions.
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -101,7 +101,7 @@ public final class ChannelDecoder extend
/**
* The pattern to use for separating the component of a time unit.
- * An example of time unit is "<cite>days since 1970-01-01T00:00:00Z</cite>".
+ * An example of time unit is <cite>"days since 1970-01-01T00:00:00Z"</cite>.
*
* @see #numberToDate(String, Number[])
*/
@@ -648,7 +648,7 @@ public final class ChannelDecoder extend
/**
* Converts the given numerical values to date, using the information provided in the given unit symbol.
- * The unit symbol is typically a string like "<cite>days since 1970-01-01T00:00:00Z</cite>".
+ * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
*
* @param values The values to convert. May contains {@code null} elements.
* @return The converted values. May contains {@code null} elements.
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -71,7 +71,7 @@ final class GridGeometryInfo extends Gri
}
/**
- * Returns the number of dimensions of source coordinates in the "<cite>grid to CRS</cite>" conversion.
+ * Returns the number of dimensions of source coordinates in the <cite>"grid to CRS"</cite> conversion.
* This is the number of dimensions of the <em>grid</em>.
*/
@Override
@@ -80,7 +80,7 @@ final class GridGeometryInfo extends Gri
}
/**
- * Returns the number of dimensions of target coordinates in the "<cite>grid to CRS</cite>" conversion.
+ * Returns the number of dimensions of target coordinates in the <cite>"grid to CRS"</cite> conversion.
* This is the number of dimensions of the <em>coordinate reference system</em>.
*/
@Override
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -28,11 +28,11 @@
* factors.</p>
*
* <p>A side effect of this isolation layer is also to adapt NetCDF vocabulary to Apache SIS one.
- * For example what NetCDF calls "<cite>coordinate system</cite>" is actually a mix of what OGC/ISO
- * specifications call "<cite>coordinate system</cite>", "<cite>coordinate reference system</cite>"
- * and "<cite>grid geometry</cite>". The NetCDF coordinate system "<cite>range</cite>" is closer to
- * ISO 19123 "<cite>domain</cite>", the NetCDF coordinate system "<cite>domain</cite>" is closer to
- * ISO 19123 "<cite>grid envelope</cite>" and the ISO 19123 "<cite>range</cite>" is rather related
+ * For example what NetCDF calls <cite>"coordinate system"</cite> is actually a mix of what OGC/ISO
+ * specifications call <cite>"coordinate system"</cite>, <cite>"coordinate reference system"</cite>
+ * and <cite>"grid geometry"</cite>. The NetCDF coordinate system <cite>"range"</cite> is closer to
+ * ISO 19123 <cite>"domain"</cite>, the NetCDF coordinate system <cite>"domain"</cite> is closer to
+ * ISO 19123 <cite>"grid envelope"</cite> and the ISO 19123 <cite>"range"</cite> is rather related
* to the NetCDF variable minimum and maximum values. Trying to use OGC/ISO and NetCDF objects in
* the same code appears to be <strong>very</strong> confusing. This isolation layer allows our code
* use a more consistent vocabulary (compared to the rest of Apache SIS).</p>
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -243,7 +243,7 @@ public final class DecoderWrapper extend
/**
* Converts the given numerical values to date, using the information provided in the given unit symbol.
- * The unit symbol is typically a string like "<cite>days since 1970-01-01T00:00:00Z</cite>".
+ * The unit symbol is typically a string like <cite>"days since 1970-01-01T00:00:00Z"</cite>.
*
* @param values The values to convert. May contains {@code null} elements.
* @return The converted values. May contains {@code null} elements.
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -95,7 +95,7 @@ import static org.apache.sis.internal.ut
* {@linkplain #LONGITUDE longitude} and {@linkplain #LATITUDE latitude} resolutions are
* often more accurate in that group.
*
- * {@section Known limitations}
+ * <div class="section">Known limitations</div>
* <ul>
* <li>{@code "degrees_west"} and {@code "degrees_south"} units not correctly handled.</li>
* <li>Units of measurement not yet declared in the {@link Band} elements.</li>
@@ -856,7 +856,7 @@ final class MetadataReader {
String name = variable.getName();
if (name != null && !(name = name.trim()).isEmpty()) {
if (nameFactory == null) {
- nameFactory = DefaultFactories.NAMES; // Real dependency injection to be used in a future version.
+ nameFactory = DefaultFactories.forBuildin(NameFactory.class); // Real dependency injection to be used in a future version.
}
band.setSequenceIdentifier(nameFactory.createMemberName(null, name,
nameFactory.createTypeName(null, variable.getDataTypeName())));
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -46,7 +46,7 @@ import org.apache.sis.util.Version;
* on the classpath, then this class tries to instantiate a {@code NetcdfStore} backed by
* the UCAR library.
*
- * {@section Thread safety}
+ * <div class="section">Thread safety</div>
* The same {@code NetcdfStoreProvider} instance can be safely used by many threads without synchronization on
* the part of the caller. However the {@link NetcdfStore} instances created by this factory are not thread-safe.
*
Modified: sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -28,20 +28,20 @@
* The NetCDF attributes recognized by this package are listed in the
* {@link org.apache.sis.storage.netcdf.AttributeNames} class.
*
- * {@section Note on the definition of terms}
+ * <div class="section">Note on the definition of terms</div>
* The UCAR library sometime uses the same words than the ISO/OGC standards for different things.
- * In particular the words "<cite>domain</cite>" and "<cite>range</cite>" can be applied to arbitrary functions,
+ * In particular the words <cite>"domain"</cite> and <cite>"range"</cite> can be applied to arbitrary functions,
* and the UCAR library chooses to apply it to the function that converts grid indices to geodetic coordinates.
* The ISO 19123 standard on the other hand considers coverage as a function, and applies those <cite>domain</cite>
* and <cite>range</cite> words to that function. More specifically:
*
* <ul>
- * <li>UCAR "<cite>coordinate system</cite>" is actually a mix of <cite>coordinate system</cite>,
+ * <li>UCAR <cite>"coordinate system"</cite> is actually a mix of <cite>coordinate system</cite>,
* <cite>coordinate reference system</cite> and <cite>grid geometry</cite> in OGC sense.</li>
- * <li>UCAR coordinate system "<cite>domain</cite>" is not equivalent to ISO 19123 coverage domain,
+ * <li>UCAR coordinate system <cite>"domain"</cite> is not equivalent to ISO 19123 coverage domain,
* but is rather related to <cite>grid envelope</cite>.</li>
- * <li>ISO 19123 coverage <cite>domain</cite> is related to UCAR coordinate system "<cite>range</cite>".</li>
- * <li>ISO 19123 coverage <cite>range</cite> is not equivalent to UCAR "<cite>range</cite>",
+ * <li>ISO 19123 coverage <cite>domain</cite> is related to UCAR coordinate system <cite>"range"</cite>.</li>
+ * <li>ISO 19123 coverage <cite>range</cite> is not equivalent to UCAR <cite>"range"</cite>,
* but is rather related to the NetCDF variable's minimum and maximum values.</li>
* </ul>
*
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -40,7 +40,7 @@ import java.nio.channels.FileChannel;
* The channel and the buffer must be supplied by the caller. It is okay if they have already been used
* before {@code ChannelDataInput} creation.
*
- * {@section Encapsulation}
+ * <div class="section">Encapsulation</div>
* This class exposes publicly the {@linkplain #channel} and the {@linkplain #buffer buffer} because this class
* is not expected to perform all possible data manipulations that we can do with the buffers. This class is only
* a helper tool, which often needs to be completed by specialized operations performed directly on the buffer.
@@ -50,7 +50,7 @@ import java.nio.channels.FileChannel;
* <p>Since this class is only a helper tool, it does not "own" the channel and consequently does not provide
* {@code close()} method. It is users responsibility to close the channel after usage.</p>
*
- * {@section Relationship with <code>DataInput</code>}
+ * <div class="section">Relationship with {@code DataInput}</div>
* This class API is compatibly with the {@link java.io.DataInput} interface, so subclasses can implement that
* interface if they wish. This class does not implement {@code DataInput} itself because it is not needed for
* SIS purposes, and because {@code DataInput} has undesirable methods ({@code readLine()} and {@code readUTF()}).
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataOutput.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataOutput.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataOutput.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataOutput.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -41,7 +41,7 @@ import java.nio.channels.FileChannel;
* The channel and the buffer must be supplied by the caller. It is okay if they have already been used
* before {@code ChannelDataOutput} creation.
*
- * {@section Encapsulation}
+ * <div class="section">Encapsulation</div>
* This class exposes publicly the {@linkplain #channel} and the {@linkplain #buffer buffer} because this class
* is not expected to perform all possible data manipulations that we can do with the buffers. This class is only
* a helper tool, which often needs to be completed by specialized operations performed directly on the buffer.
@@ -51,7 +51,7 @@ import java.nio.channels.FileChannel;
* <p>Since this class is only a helper tool, it does not "own" the channel and consequently does not provide
* {@code close()} method. It is users responsibility to close the channel after usage.</p>
*
- * {@section Relationship with <code>DataOutput</code>}
+ * <div class="section">Relationship with {@code DataOutput}</div>
* This class API is compatibly with the {@link java.io.DataOutput} interface, so subclasses can implement that
* interface if they wish. This class does not implement {@code DataOutput} itself because it is not needed for
* SIS purposes.
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -306,7 +306,7 @@ public final class IOUtilities extends S
* the URL is converted to a {@link File} object using the given {@code encoding} for decoding
* the {@code "%XX"} sequences, if any.
*
- * {@section Rational}
+ * <div class="section">Rational</div>
* A URL can represent a file, but {@link URL#openStream()} appears to return a {@code BufferedInputStream}
* wrapping the {@link FileInputStream}, which is not a desirable feature when we want to obtain a channel.
*
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -31,7 +31,7 @@ import org.apache.sis.internal.jdk7.Auto
/**
* Manages a series of features, coverages or sensor data.
*
- * {@section Thread safety policy}
+ * <div class="section">Thread safety policy</div>
* This {@code DataStore} base class is thread-safe. However subclasses are usually not.
* Unless otherwise specified by subclasses, users should assume that {@code DataStore}
* instances are not thread-safe.
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -29,7 +29,7 @@ package org.apache.sis.storage;
* to open a given {@link StorageConnector}.</li>
* </ul>
*
- * {@section Packaging data stores}
+ * <div class="section">Packaging data stores</div>
* JAR files that provide implementations of this class shall contain an entry with exactly the following path:
*
* {@preformat text
@@ -40,7 +40,7 @@ package org.apache.sis.storage;
* where each line is the fully qualified name of the implementation class.
* See {@link java.util.ServiceLoader} for more general discussion about this lookup mechanism.
*
- * {@section Thread safety}
+ * <div class="section">Thread safety</div>
* All {@code DataStoreProvider} implementations shall be thread-safe.
* However the {@code DataStore} instances created by the providers do not need to be thread-safe.
*
@@ -76,7 +76,7 @@ public abstract class DataStoreProvider
* {@link java.nio.ByteBuffer#mark()}, {@link java.io.InputStream#mark(int)} and
* {@link javax.imageio.stream.ImageInputStream#mark()}.</p>
*
- * {@section Implementation example}
+ * <div class="note"><b>Implementation example</b><br>
* Implementations will typically check the first bytes of the stream for a "magic number" associated
* with the format, as in the following example:
*
@@ -102,6 +102,7 @@ public abstract class DataStoreProvider
* return ProbeResult.SUPPORTED;
* }
* }
+ * </div>
*
* @param storage Information about the storage (URL, stream, JDBC connection, <i>etc</i>).
* @return {@link ProbeResult#SUPPORTED} if the given storage seems to be readable by the {@code DataStore}
@@ -114,7 +115,7 @@ public abstract class DataStoreProvider
/**
* Returns a data store implementation associated with this provider.
*
- * {@section Implementation note}
+ * <div class="section">Implementation note</div>
* Implementors shall invoke {@link StorageConnector#closeAllExcept(Object)} after {@code DataStore}
* creation, keeping open only the needed resource.
*
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -33,7 +33,7 @@ import org.apache.sis.util.resources.Err
* This class is package-private for now in order to get more experience about what could be a good API.
* This class may become public in a future SIS version.</div>
*
- * {@section Thread safety}
+ * <div class="section">Thread safety</div>
* The same {@code DataStoreRegistry} instance can be safely used by many threads without synchronization
* on the part of the caller.
*
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -35,7 +35,7 @@ public final class DataStores extends St
/**
* The registry to use for searching for {@link DataStoreProvider} implementations.
*
- * {@section Class loader}
+ * <div class="section">Class loader</div>
* In current implementation, this registry is instantiated when first needed using the
* {@linkplain Thread#getContextClassLoader() context class loader}. This means that the set of
* available formats may depend on the first thread that invoked a {@code DataStores} method.
Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java?rev=1670485&r1=1670484&r2=1670485&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java [UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java [UTF-8] Tue Mar 31 21:30:06 2015
@@ -30,7 +30,7 @@ import org.apache.sis.internal.jdk7.Obje
* {@code ProbeResult} may also provide additional information, like file MIME type and the
* format version.
*
- * {@section Usage}
+ * <div class="section">Usage</div>
* When a {@link DataStores#open DataStores.open(…)} method is invoked, SIS will iterate over the list of known
* providers and invoke the {@link DataStoreProvider#probeContent(StorageConnector)} method for each of them.
* The {@code ProbeResult} value returned by {@code probeContent(…)} tells to SIS whether a particular
@@ -40,7 +40,7 @@ import org.apache.sis.internal.jdk7.Obje
* Other properties like {@link #getVersion()} are sometime available for both supported and unsupported storages.
* For example a file may be encoded in a known format, but may be using an unsupported version of that format.</p>
*
- * {@section Special values}
+ * <div class="section">Special values</div>
* In addition to the supported/unsupported information, {@code ProbeResult} defines two constants having
* a special meaning: {@link #INSUFFICIENT_BYTES} and {@link #UNDETERMINED}, which indicate that the provider does
* not have enough information for telling whether the storage can be opened.
@@ -183,7 +183,7 @@ public class ProbeResult implements Seri
* The {@link DataStoreProvider} may (at implementation choice) inspect the storage content for
* determining a more accurate MIME type.
*
- * {@section XML types}
+ * <div class="section">XML types</div>
* A generic MIME type for XML documents is {@code "application/xml"}.
* However many other MIME types exist for XML documents compliant to some particular shema.
* Those types can be determined by inspecting the namespace of XML root element.