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 2014/09/20 01:47:58 UTC
svn commit: r1626370 - in /sis/trunk: ./
core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/
core/sis-metadata/src/main/java/org/apache/sis/metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/
core/sis-meta...
Author: desruisseaux
Date: Fri Sep 19 23:47:57 2014
New Revision: 1626370
URL: http://svn.apache.org/r1626370
Log:
Merge from the JDK6 branch.
Added:
sis/trunk/src/main/javadoc/warning.png
- copied unchanged from r1626369, sis/branches/JDK6/src/main/javadoc/warning.png
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
sis/trunk/pom.xml
sis/trunk/src/main/javadoc/stylesheet.css
Propchange: sis/trunk/
------------------------------------------------------------------------------
Merged /sis/branches/JDK8:r1625175-1626366
Merged /sis/branches/JDK7:r1625179-1626367
Merged /sis/branches/JDK6:r1625242-1626369
Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -103,7 +103,7 @@ public final class Doclet extends HtmlDo
* Copies the standard CSS file, then copies the custom CSS file.
*
* @param inputFile The standard CSS file generated by the standard doclet.
- * @param outputDirectory The custom CSS file to copy.
+ * @param outputDirectory The directory where to copy the CSS file.
* @throws IOException If an error occurred while reading or writing.
*/
private static void copyStylesheet(final File inputFile, final File outputDirectory) throws IOException {
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -333,9 +333,9 @@ public class MetadataStandard implements
if (accessors.containsKey(type)) {
return true;
}
- final Class<?> standard = findInterface(type);
- if (standard != null) {
- accessors.put(type, standard);
+ final Class<?> standardType = findInterface(type);
+ if (standardType != null) {
+ accessors.put(type, standardType);
return true;
}
}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -268,7 +268,7 @@ public class DefaultObjective extends IS
}
/**
- * Set the extent information including the bounding box, bounding polygon, vertical and
+ * Sets the extent information including the bounding box, bounding polygon, vertical and
* temporal extent of the objective.
*
* @param newValues The new extents values.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -138,7 +138,7 @@ public class DefaultCitation extends ISO
/**
* Roles, Name, contact, and position information for an individual or organization that is responsible
- * for the resource. Returns an empty collection if there is none.
+ * for the resource.
*/
private Collection<ResponsibleParty> citedResponsibleParties;
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -118,7 +118,7 @@ public class DefaultIndividual extends A
}
/**
- * Set a new position of the individual in an organization.
+ * Sets a new position of the individual in an organization.
*
* @param newValue The new position of the individual in an organization.
*/
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -16,8 +16,8 @@
*/
package org.apache.sis.metadata.iso.citation;
-import java.util.Collection;
import java.util.Iterator;
+import java.util.Collection;
import java.util.Collections;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -191,7 +191,7 @@ public class DefaultTelephone extends IS
}
/**
- * Set the type of telephone number.
+ * Sets the type of telephone number.
* If non-null, the type can only be {@code "VOICE"}, {@code "FACSIMILE"} or {@code "SMS"}.
*
* <div class="warning"><b>Upcoming API change — specialization</b><br>
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -247,7 +247,7 @@ public class DefaultBand extends Default
}
/**
- * Set a new units in which sensor wavelengths are expressed.
+ * Sets a new units in which sensor wavelengths are expressed.
*
* @param newValue the new unit.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -145,7 +145,7 @@ public class DefaultFeatureTypeInfo exte
}
/**
- * Set a new number of occurrence of feature instances for this feature types.
+ * Sets a new number of occurrence of feature instances for this feature types.
*
* @param newValue the new number of occurrence.
* @throws IllegalArgumentException if the given value is negative.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -127,7 +127,7 @@ public class DefaultSampleDimension exte
private RecordType otherPropertyType;
/**
- * Instance of other/attributeType that defines attributs not explicitly
+ * Instance of other/attributeType that defines attributes not explicitly
* included in {@link CoverageContentType}.
*/
private Record otherProperty;
@@ -229,7 +229,7 @@ public class DefaultSampleDimension exte
}
/**
- * Set the maximum value of data values in each dimension included in the resource.
+ * Sets the maximum value of data values in each dimension included in the resource.
*
* @param newValue The new new maximum value.
*/
@@ -239,9 +239,9 @@ public class DefaultSampleDimension exte
}
/**
- * Returns the units of data in each dimension included in the resource.
+ * Returns the units of data in the dimension.
*
- * @return The units of data in each dimension included in the resource, or {@code null} if unspecified.
+ * @return The units of data in the dimension, or {@code null} if unspecified.
*/
@XmlElement(name = "units")
@UML(identifier="units", obligation=CONDITIONAL, specification=ISO_19115)
@@ -250,9 +250,9 @@ public class DefaultSampleDimension exte
}
/**
- * Sets the units of data in each dimension included in the resource.
+ * Sets the units of data in the dimension.
*
- * @param newValue The new units of data in each dimension included in the resource.
+ * @param newValue The new units of data in the dimension.
*/
public void setUnits(final Unit<?> newValue) {
checkWritePermission();
@@ -271,7 +271,7 @@ public class DefaultSampleDimension exte
}
/**
- * Set the scale factor which has been applied to the cell value.
+ * Sets the scale factor which has been applied to the cell value.
*
* @param newValue The new scale factor which has been applied to the cell value.
*/
@@ -334,7 +334,7 @@ public class DefaultSampleDimension exte
}
/**
- * Set the number of values used in a thematic classification resource.
+ * Sets the number of values used in a thematic classification resource.
*
* @param newValues The new number of values used in a thematic classification resource.
*/
@@ -376,7 +376,7 @@ public class DefaultSampleDimension exte
}
/**
- * Set a new type of other attribute description.
+ * Sets a new type of other attribute description.
*
* @param newValue The new type of other attribute description.
*/
@@ -398,7 +398,7 @@ public class DefaultSampleDimension exte
}
/**
- * Set a new instance of other/attributeType that defines attributs not explicitly
+ * Sets a new instance of other/attributeType that defines attributes not explicitly
* included in {@link CoverageContentType}.
*
* @param newValue The new instance of other/attributeType.
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -30,6 +30,7 @@ import org.opengis.metadata.distribution
import org.opengis.metadata.distribution.MediumFormat;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.metadata.iso.ISOMetadata;
+import org.apache.sis.internal.jaxb.NonMarshalledAuthority;
import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
@@ -99,11 +100,6 @@ public class DefaultMedium extends ISOMe
private InternationalString mediumNote;
/**
- * Unique identifier for an instance of the medium.
- */
- private Identifier identifier;
-
- /**
* Constructs an initially empty medium.
*/
public DefaultMedium() {
@@ -128,7 +124,7 @@ public class DefaultMedium extends ISOMe
mediumFormats = copyCollection(object.getMediumFormats(), MediumFormat.class);
mediumNote = object.getMediumNote();
if (object instanceof DefaultMedium) {
- identifier = ((DefaultMedium) object).getIdentifier();
+ identifiers = singleton(((DefaultMedium) object).getIdentifier(), Identifier.class);
}
}
}
@@ -295,7 +291,7 @@ public class DefaultMedium extends ISOMe
*/
/// @XmlElement(name = "identifier")
public Identifier getIdentifier() {
- return identifier;
+ return NonMarshalledAuthority.getMarshallable(identifiers);
}
/**
@@ -307,6 +303,7 @@ public class DefaultMedium extends ISOMe
*/
public void setIdentifier(final Identifier newValue) {
checkWritePermission();
- identifier = newValue;
+ identifiers = nonNullCollection(identifiers, Identifier.class);
+ NonMarshalledAuthority.setMarshallable(identifiers, newValue);
}
}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -170,7 +170,7 @@ public class DefaultSpatialTemporalExten
}
/**
- * Set the vertical extent component.
+ * Sets the vertical extent component.
*
* @param newValue The new vertical extent component.
*
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -131,7 +131,7 @@ public class DefaultOperationChainMetada
}
/**
- * Set the name used by the service for this chain.
+ * Sets the name used by the service for this chain.
*
* @param newValue The new name used by the service for this chain.
*/
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -153,7 +153,7 @@ public class DefaultOperationMetadata ex
}
/**
- * Set the unique identifier for this interface.
+ * Sets the unique identifier for this interface.
*
* @param newValue The new unique identifier for this interface.
*/
@@ -289,7 +289,7 @@ public class DefaultOperationMetadata ex
}
/**
- * Set the list of operation that must be completed before current operation is invoked.
+ * Sets the list of operation that must be completed before current operation is invoked.
*
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* The element type will be changed to the {@code OperationMetadata} interface
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -30,33 +30,46 @@
* <th class="sep">Aggregation hierarchy</th>
* </tr><tr><td style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
- * {@code │ ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification Data identification}<br>
- * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultServiceIdentification Service identification}<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution Resolution}<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic Browse graphic}<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords Keywords}<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultUsage Usage}<br>
- * {@code └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultAggregateInformation Aggregate information}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
+ * {@code │ ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification Data identification}<br>
+ * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultServiceIdentification Service identification}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution Resolution}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic Browse graphic}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords Keywords}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultUsage Usage}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultAggregateInformation Aggregate information}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultCoupledResource Coupled resource}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultOperationMetadata Operation metadata}<br>
+ * {@code └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultOperationChainMetadata Operation chain metadata}<br>
* {@linkplain org.opengis.util.CodeList Code list}<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.Progress Progress}<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.KeywordType Keyword type}<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.AssociationType Association type}<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.InitiativeType Initiative type}<br>
- * {@code └─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category}<br>
+ * {@code ├─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category}<br>
+ * {@code ├─} {@linkplain org.opengis.metadata.identification.CouplingType Coupling type}<br>
+ * {@code └─} {@linkplain org.opengis.metadata.identification.DistributedComputingPlatform Distributed computing platform}<br>
* </td><td class="sep" style="width: 50%; white-space: nowrap">
- * {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution Resolution}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category} «code list»<br>
- * {@code ├─} {@linkplain org.opengis.metadata.identification.Progress Progress} «code list»<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic Browse graphic}<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords Keywords}<br>
- * {@code │ └─} {@linkplain org.opengis.metadata.identification.KeywordType Keyword type} «code list»<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultUsage Usage}<br>
- * {@code └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultAssociatedResource Associated resource}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.identification.AssociationType Association type} «code list»<br>
- * {@code └─} {@linkplain org.opengis.metadata.identification.InitiativeType Initiative type} «code list»<br>
- * {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification Data identification}<br>
+ * {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution Resolution}<br>
+ * {@code ├─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category} «code list»<br>
+ * {@code ├─} {@linkplain org.opengis.metadata.identification.Progress Progress} «code list»<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic Browse graphic}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords Keywords}<br>
+ * {@code │ └─} {@linkplain org.opengis.metadata.identification.KeywordType Keyword type} «code list»<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultUsage Usage}<br>
+ * {@code └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultAssociatedResource Associated resource}<br>
+ * {@code ├─} {@linkplain org.opengis.metadata.identification.AssociationType Association type} «code list»<br>
+ * {@code └─} {@linkplain org.opengis.metadata.identification.InitiativeType Initiative type} «code list»<br>
+ * {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification Data identification}<br>
+ * {@linkplain org.apache.sis.metadata.iso.identification.DefaultServiceIdentification Service identification}<br>
+ * {@code ├─} {@linkplain org.opengis.metadata.identification.CouplingType Coupling type} «code list»<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultCoupledResource Coupled resource}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultOperationMetadata Operation metadata}<br>
+ * {@code │ ├─} {@linkplain org.opengis.metadata.identification.DistributedComputingPlatform Distributed computing platform} «code list»<br>
+ * {@code │ └─} {@linkplain org.apache.sis.parameter.DefaultParameterDescriptor Parameter descriptor}<br>
+ * {@code │ └─} {@linkplain org.opengis.parameter.ParameterDirection Parameter direction} «enum»<br>
+ * {@code └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultOperationChainMetadata Operation chain metadata}<br>
* </td></tr></table>
*
* <p>In addition to the standard properties, SIS provides the following methods:</p>
Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -122,11 +122,11 @@ public final strictfp class PropertyAcce
final String propertyName = (String) expected[i++];
final String umlIdentifier = (String) expected[i++];
final String sentence = (String) expected[i++];
- assertEquals("declaringType", declaringType, accessor.type(index, TypeValuePolicy.DECLARING_INTERFACE));
assertEquals("methodName", methodName, accessor.name(index, KeyNamePolicy.METHOD_NAME));
assertEquals("propertyName", propertyName, accessor.name(index, KeyNamePolicy.JAVABEANS_PROPERTY));
assertEquals("umlIdentifier", umlIdentifier, accessor.name(index, KeyNamePolicy.UML_IDENTIFIER));
assertEquals("sentence", sentence, accessor.name(index, KeyNamePolicy.SENTENCE));
+ assertEquals("declaringType", declaringType, accessor.type(index, TypeValuePolicy.DECLARING_INTERFACE));
assertEquals(methodName, index, accessor.indexOf(methodName, false));
assertEquals(propertyName, index, accessor.indexOf(propertyName, false));
assertEquals(umlIdentifier, index, accessor.indexOf(umlIdentifier, false));
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/AbstractParameterDescriptor.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -41,50 +41,50 @@ import org.apache.sis.internal.jdk7.Obje
* Service Metadata (ISO 19115) and Web Processing Services (WPS) standards.
* The main information are:
*
- * <table class="ogc">
+ * <table class="sis">
* <caption>Main parameter properties</caption>
* <tr>
* <th>Getter method</th>
- * <th>ISO 19111</th>
- * <th>WPS</th>
- * <th>ISO 19115</th>
+ * <th class="sep">ISO 19111</th>
+ * <th class="sep">WPS</th>
+ * <th class="sep">ISO 19115</th>
* <th class="sep">Remarks</th>
* </tr>
* <tr>
- * <td>{@link #getName()}</td>
- * <td>{@code name}</td>
- * <td>{@code Identifier}</td>
- * <td>{@code name}</td>
- * <td class="sep">See {@linkplain #getName() method javadoc} for {@code MemberName} ↔ {@code Identifier} mapping.</td>
+ * <td>{@link #getName() getName()}</td>
+ * <td class="sep">{@code name}</td>
+ * <td class="sep">{@code Identifier}</td>
+ * <td class="sep">{@code name}</td>
+ * <td class="sep">See {@link Parameters#getMemberName(ParameterDescriptor)} for {@code MemberName} ↔ {@code Identifier} mapping.</td>
* </tr>
* <!-- "Title" (WPS) equivalent to "designation" (Feature), but not yet provided. -->
* <tr>
- * <td>{@link #getDescription()}</td>
- * <td></td>
- * <td>{@code Abstract}</td>
- * <td>{@code description}</td>
- * <td class="sep">Also known as “definition”.</td>
+ * <td>{@link #getDescription()}</td>
+ * <td class="sep"></td>
+ * <td class="sep">{@code Abstract}</td>
+ * <td class="sep">{@code description}</td>
+ * <td class="sep">Also known as “definition”.</td>
* </tr>
* <tr>
- * <td>{@link #getDirection()}</td>
- * <td></td>
- * <td></td>
- * <td>{@code direction}</td>
- * <td class="sep">Tells if the parameter is a WPS {@code Input} or {@code Output} structure.</td>
+ * <td>{@link #getDirection()}</td>
+ * <td class="sep"></td>
+ * <td class="sep"></td>
+ * <td class="sep">{@code direction}</td>
+ * <td class="sep">Tells if the parameter is a WPS {@code Input} or {@code Output} structure.</td>
* </tr>
* <tr>
- * <td>{@link #getMinimumOccurs()}</td>
- * <td>{@code minimumOccurs}</td>
- * <td>{@code MinOccurs}</td>
- * <td>{@code optionality}</td>
- * <td class="sep">{@code optionality = (minimumOccurs > 0)}</td>
+ * <td>{@link #getMinimumOccurs()}</td>
+ * <td class="sep">{@code minimumOccurs}</td>
+ * <td class="sep">{@code MinOccurs}</td>
+ * <td class="sep">{@code optionality}</td>
+ * <td class="sep">{@code optionality = (minimumOccurs > 0)}</td>
* </tr>
* <tr>
- * <td>{@link #getMaximumOccurs()}</td>
- * <td>{@code maximumOccurs}</td>
- * <td>{@code MaxOccurs}</td>
- * <td>{@code repeatability}</td>
- * <td class="sep">{@code repeatability = (maximumOccurs > 1)}</td>
+ * <td>{@link #getMaximumOccurs()}</td>
+ * <td class="sep">{@code maximumOccurs}</td>
+ * <td class="sep">{@code MaxOccurs}</td>
+ * <td class="sep">{@code repeatability}</td>
+ * <td class="sep">{@code repeatability = (maximumOccurs > 1)}</td>
* </tr>
* </table>
*
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -36,9 +36,12 @@ import org.apache.sis.io.wkt.ElementKind
import org.apache.sis.internal.referencing.WKTUtilities;
import org.apache.sis.internal.util.Numerics;
import org.apache.sis.util.Numbers;
+import org.apache.sis.util.ComparisonMode;
+import org.apache.sis.util.LenientComparable;
import org.apache.sis.util.resources.Errors;
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
+import static org.apache.sis.util.Utilities.deepEquals;
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects;
@@ -109,7 +112,9 @@ import org.apache.sis.internal.jdk7.Obje
* @see DefaultParameterDescriptor
* @see DefaultParameterValueGroup
*/
-public class DefaultParameterValue<T> extends FormattableObject implements ParameterValue<T>, Serializable, Cloneable {
+public class DefaultParameterValue<T> extends FormattableObject implements ParameterValue<T>,
+ LenientComparable, Serializable, Cloneable
+{
/**
* Serial number for inter-operability with different versions.
*/
@@ -227,7 +232,7 @@ public class DefaultParameterValue<T> ex
public boolean booleanValue() throws IllegalStateException {
final T value = getValue();
if (value instanceof Boolean) {
- return ((Boolean) value).booleanValue();
+ return (Boolean) value;
}
throw incompatibleValue(value);
}
@@ -676,26 +681,55 @@ public class DefaultParameterValue<T> ex
/**
* Compares the specified object with this parameter for equality.
+ * The strictness level is controlled by the second argument.
*
* @param object The object to compare to {@code this}.
- * @return {@code true} if both objects are equal.
+ * @param mode The strictness level of the comparison.
+ * @return {@code true} if both objects are equal according the given comparison mode.
*/
@Override
- public boolean equals(final Object object) {
+ public boolean equals(final Object object, final ComparisonMode mode) {
if (object == this) {
// Slight optimization
return true;
}
- if (object != null && getClass() == object.getClass()) {
- final DefaultParameterValue<?> that = (DefaultParameterValue<?>) object;
- return Objects.equals(descriptor, that.descriptor) &&
- Objects.equals(value, that.value) &&
- Objects.equals(unit, that.unit);
+ if (object != null) {
+ if (mode == ComparisonMode.STRICT) {
+ if (getClass() == object.getClass()) {
+ final DefaultParameterValue<?> that = (DefaultParameterValue<?>) object;
+ return Objects.equals(descriptor, that.descriptor) &&
+ Objects.equals(value, that.value) &&
+ Objects.equals(unit, that.unit);
+ }
+ } else if (object instanceof ParameterValue<?>) {
+ final ParameterValue<?> that = (ParameterValue<?>) object;
+ return deepEquals(getDescriptor(), that.getDescriptor(), mode) &&
+ deepEquals(getValue(), that.getValue(), mode) &&
+ Objects.equals(getUnit(), that.getUnit());
+ }
}
return false;
}
/**
+ * Compares the specified object with this parameter for equality.
+ * This method is implemented as below:
+ *
+ * {@preformat java
+ * return equals(other, ComparisonMode.STRICT);
+ * }
+ *
+ * Subclasses shall override {@link #equals(Object, ComparisonMode)} instead than this method.
+ *
+ * @param object The object to compare to {@code this}.
+ * @return {@code true} if both objects are equal.
+ */
+ @Override
+ public final boolean equals(final Object object) {
+ return equals(object, ComparisonMode.STRICT);
+ }
+
+ /**
* Returns a hash value for this parameter.
*
* @return The hash code value. This value doesn't need to be the same
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -27,10 +27,13 @@ import org.opengis.parameter.GeneralPara
import org.opengis.parameter.GeneralParameterDescriptor;
import org.opengis.parameter.ParameterNotFoundException;
import org.opengis.parameter.InvalidParameterCardinalityException;
+import org.apache.sis.util.LenientComparable;
+import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Debug;
+import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.referencing.IdentifiedObjects.isHeuristicMatchForName;
// Branch-dependent imports
@@ -100,7 +103,9 @@ import org.apache.sis.internal.jdk7.Obje
* @see DefaultParameterDescriptorGroup
* @see DefaultParameterValue
*/
-public class DefaultParameterValueGroup implements ParameterValueGroup, Serializable, Cloneable {
+public class DefaultParameterValueGroup implements ParameterValueGroup,
+ LenientComparable, Serializable, Cloneable
+{
/**
* Serial number for inter-operability with different versions.
*/
@@ -318,24 +323,53 @@ public class DefaultParameterValueGroup
/**
* Compares the specified object with this parameter for equality.
+ * The strictness level is controlled by the second argument.
*
* @param object The object to compare to {@code this}.
- * @return {@code true} if both objects are equal.
+ * @param mode The strictness level of the comparison.
+ * @return {@code true} if both objects are equal according the given comparison mode.
*/
@Override
- public boolean equals(final Object object) {
+ public boolean equals(final Object object, final ComparisonMode mode) {
if (object == this) {
+ // Slight optimization
return true;
}
- if (object != null && getClass() == object.getClass()) {
- final DefaultParameterValueGroup that = (DefaultParameterValueGroup) object;
- return Objects.equals(values.descriptor, that.values.descriptor) &&
- Objects.equals(values, that.values);
+ if (object != null) {
+ if (mode == ComparisonMode.STRICT) {
+ if (getClass() == object.getClass()) {
+ final DefaultParameterValueGroup that = (DefaultParameterValueGroup) object;
+ return Objects.equals(values.descriptor, that.values.descriptor) &&
+ Objects.equals(values, that.values);
+ }
+ } else if (object instanceof ParameterValueGroup) {
+ final ParameterValueGroup that = (ParameterValueGroup) object;
+ return deepEquals(getDescriptor(), that.getDescriptor(), mode) &&
+ deepEquals(values(), that.values(), mode);
+ }
}
return false;
}
/**
+ * Compares the specified object with this parameter for equality.
+ * This method is implemented as below:
+ *
+ * {@preformat java
+ * return equals(other, ComparisonMode.STRICT);
+ * }
+ *
+ * Subclasses shall override {@link #equals(Object, ComparisonMode)} instead than this method.
+ *
+ * @param object The object to compare to {@code this}.
+ * @return {@code true} if both objects are equal.
+ */
+ @Override
+ public final boolean equals(final Object object) {
+ return equals(object, ComparisonMode.STRICT);
+ }
+
+ /**
* Returns a hash value for this parameter.
*
* @return The hash code value. This value doesn't need to be the same
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterBuilder.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -101,6 +101,22 @@ public class ParameterBuilder extends Bu
}
/**
+ * Sets the parameter description as a {@code String} or {@code InternationalString} instance.
+ * Calls to this method overwrite any previous value.
+ *
+ * <p><b>Lifetime:</b>
+ * previous descriptions are discarded by calls to {@code setDescription(…)}.
+ * Descriptions are cleared after a {@code createXXX(…)} method has been invoked.</p>
+ *
+ * @param description The description, or {@code null} if none.
+ * @return {@code this}, for method call chaining.
+ */
+ public ParameterBuilder setDescription(final CharSequence description) {
+ properties.put(AbstractParameterDescriptor.DESCRIPTION_KEY, description);
+ return this;
+ }
+
+ /**
* Sets whether the parameter is mandatory or optional.
* This property determines the {@linkplain DefaultParameterDescriptor#getMinimumOccurs() minimum number
* of times} that values are required, which will be 0 for an optional parameter and 1 for a mandatory one.
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -144,7 +144,7 @@ public final class Parameters extends St
* This method performs the following checks:
*
* <ul>
- * <li>If the {@linkplain DefaultParameterDescriptor#getName()} primary name is an instance of {@code MemberName},
+ * <li>If the {@linkplain DefaultParameterDescriptor#getName() primary name} is an instance of {@code MemberName},
* returns that primary name.</li>
* <li>Otherwise this method searches for the first {@linkplain DefaultParameterDescriptor#getAlias() alias}
* which is an instance of {@code MemberName}. If found, that alias is returned.</li>
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] Fri Sep 19 23:47:57 2014
@@ -94,7 +94,7 @@ import static org.apache.sis.util.Number
* {@link #newRange(Comparable, Comparable)} method. Subclasses can override that method if they
* need to customize the range objects to be created.
*
- * <p>While it is possible to create {@code RangeSet<Date>} instances, is more efficient to
+ * <p>While it is possible to create {@code RangeSet<Date>} instances, it is more efficient to
* use {@code RangeSet<Long>} with millisecond values because {@code RangeSet} will internally
* use {@code long[]} arrays in the later case.</p>
*
Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Fri Sep 19 23:47:57 2014
@@ -517,6 +517,39 @@ Apache SIS is a free software, Java lang
</configuration>
</plugin>
+ <!-- Copy Javadoc resources in the top-level directory (not from "doc-files" subdirectories).
+ While the Maven documentation said that the "src/main/javadoc" directory is copied by default,
+ or a directory can be specified with <javadocResourcesDirectory>, I have been unable to make it
+ work even with absolute paths.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>prepare-package</phase> <!-- TODO: find some way to execute this plugin only before javadoc, not before JAR. -->
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>src/main/javadoc/</directory>
+ <includes>
+ <include>*.png</include>
+ </includes>
+ </resource>
+ </resources>
+ <outputDirectory>${basedir}/target/site/apidocs/</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- JavaDoc configuration. -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -536,28 +569,9 @@ Apache SIS is a free software, Java lang
<breakiterator>true</breakiterator> <!-- Better boundary detection when determining the end of the first sentence. -->
<stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
<validateLinks>true</validateLinks>
-
- <!-- TODO
- Following was used to work prior JDK 8. But as of Java 1.8.0_05 with maven-javadoc-plugin 2.9.1,
- this does not work anymore. A trailing slash seems mandatory with JDK 8, while the Maven plugin
- unconditionally removes any trailing slash we may insert below. For now we workaround this issue
- by using <additionalparam>-link ...</additionalparam> instead of <links>.
-
- For verifying if this problem is fixed in future JDK/Maven versions, remove the -link argument,
- uncomment the <links> block and execute "mvn javadoc:aggregate". If the following line appears,
- then the problem is not yet fixed:
-
- javadoc: warning - Error fetching URL: http://www.geoapi.org/snapshot/javadoc
-
-
<links>
<link>http://www.geoapi.org/3.0/javadoc</link>
</links>
- -->
-
- <additionalparam>
- -link http://www.geoapi.org/3.0/javadoc/
- </additionalparam>
<!-- Separates packages on the overview page into the groups specified. -->
<groups>
Modified: sis/trunk/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/trunk/src/main/javadoc/stylesheet.css?rev=1626370&r1=1626369&r2=1626370&view=diff
==============================================================================
--- sis/trunk/src/main/javadoc/stylesheet.css (original)
+++ sis/trunk/src/main/javadoc/stylesheet.css Fri Sep 19 23:47:57 2014
@@ -126,15 +126,28 @@ div.note {
margin-bottom: 9px;
}
+
/*
- * Definition of <div class="warning">
+ * The warning box for upcomming API changes. The warning icon is 64 pixels height.
+ * Since we have 30 pixels in top and bottom padding, There is 34 remaining pixels
+ * to set as the minimal height.
*/
div.warning {
- color: firebrick;
- margin-left: 40px;
- margin-right: 40px;
- margin-top: 9px;
- margin-bottom: 9px;
+ border-width: 2pt;
+ border-style: solid;
+ border-color: darkred;
+ background: antiquewhite;
+ margin: 12pt 30pt;
+ padding: 15px;
+ min-height: 34px;
+}
+
+div.warning:before {
+ position: relative;
+ float: left;
+ top: -15px;
+ left: -15px;
+ content: url("warning.png");
}