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 2017/04/03 10:58:07 UTC
svn commit: r1789948 [5/23] - in /sis/branches/JDK7: ./
application/sis-console/src/main/java/org/apache/sis/console/
application/sis-console/src/test/java/org/apache/sis/console/
application/sis-console/src/test/java/org/apache/sis/test/suite/ applica...
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -33,8 +33,8 @@ import org.apache.sis.internal.jaxb.gco.
* instead.
*
* @author Guilhem Legal (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public final class RS_Identifier extends PropertyType<RS_Identifier, Identifier> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.internal.jaxb.meta
* package documentation for more information about JAXB and interface.
*
* @author Guilhem Legal (Geomatys)
- * @since 0.3
* @version 0.4
+ * @since 0.3
* @module
*/
public final class RS_ReferenceSystem extends PropertyType<RS_ReferenceSystem, ReferenceSystem> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.internal.jaxb.gco.
* package documentation for more information about JAXB and interface.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public final class SV_CoupledResource extends PropertyType<SV_CoupledResource, CoupledResource> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.internal.jaxb.gco.
* package documentation for more information about JAXB and interface.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public final class SV_OperationChainMetadata extends PropertyType<SV_OperationChainMetadata, OperationChainMetadata> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.internal.jaxb.gco.
* package documentation for more information about JAXB and interface.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public final class SV_OperationMetadata extends PropertyType<SV_OperationMetadata, OperationMetadata> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_Parameter.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ import org.apache.sis.internal.jaxb.meta
* package documentation for more information about JAXB and interface.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public final class SV_Parameter extends PropertyType<SV_Parameter, ParameterDescriptor<?>> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/CI_OnlineResource.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.apache.sis.metadata.iso.citat
* package documentation for more information about JAXB and interface.
*
* @author Guilhem Legal (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public final class CI_OnlineResource extends MetadataAdapter<OnlineResource, DefaultOnlineResource> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_MemberName.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.opengis.util.MemberName;
* package documentation for more information about JAXB and interface.
*
* @author Guilhem Legal (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public final class GO_MemberName extends MetadataAdapter<MemberName, DefaultMemberName> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/GO_ScopedName.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,11 +27,12 @@ import org.apache.sis.internal.jaxb.gml.
* package documentation for more information about JAXB and interface.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
- * @module
*
* @see org.apache.sis.internal.jaxb.gco.GO_GenericName
+ *
+ * @since 0.5
+ * @module
*/
public final class GO_ScopedName extends XmlAdapter<CodeType.ScopedName, ScopedName> {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MD_Keywords.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.apache.sis.metadata.iso.ident
* package documentation for more information about JAXB and interface.
*
* @author Guilhem Legal (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public final class MD_Keywords extends MetadataAdapter<Keywords, DefaultKeywords> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/MetadataAdapter.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -22,12 +22,13 @@ import javax.xml.bind.annotation.adapter
/**
* Base class for adapters from GeoAPI interfaces to their SIS implementation.
*
- * @param <BoundType> the GeoAPI interface being adapted.
- * @param <ValueType> the SIS class implementing the interface.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ *
+ * @param <BoundType> the GeoAPI interface being adapted.
+ * @param <ValueType> the SIS class implementing the interface.
+ *
+ * @since 0.3
* @module
*/
public abstract class MetadataAdapter<BoundType, ValueType extends BoundType>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -45,8 +45,8 @@
* }
*
* @author Guilhem Legal (Geomatys)
- * @since 0.3
* @version 0.5
+ * @since 0.3
* @module
*/
@XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GMD, xmlns = {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -49,11 +49,12 @@
*
* @author C�dric Brian�on (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.5
- * @module
*
* @see javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter
+ *
+ * @since 0.3
+ * @module
*/
@XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GMD, xmlns = {
@XmlNs(prefix = "gmd", namespaceURI = Namespaces.GMD),
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -37,11 +37,12 @@ import org.apache.sis.util.ComparisonMod
*
* @author Guilhem Legal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.5
- * @module
*
* @see org.apache.sis.referencing.AbstractReferenceSystem
+ *
+ * @since 0.3
+ * @module
*/
@XmlRootElement(name = "MD_ReferenceSystem")
public class ReferenceSystemMetadata extends SimpleIdentifiedObject implements ReferenceSystem {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -29,8 +29,8 @@
*
* @author Martin Desruisseaux (Geomatys)
* @author R�mi Mar�chal (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
@XmlSchema(elementFormDefault = XmlNsForm.QUALIFIED, namespace = Namespaces.GMD, xmlns = {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisDirections.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -39,8 +39,8 @@ import static org.apache.sis.util.CharSe
* Utilities methods related to {@link AxisDirection}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.8
+ * @since 0.4
* @module
*/
public final class AxisDirections extends Static {
@@ -418,9 +418,9 @@ public final class AxisDirections extend
* @param unit the default unit to return if no angular unit is found.
* @return the angular unit, of {@code unit} if no angular unit was found.
*
- * @since 0.6
- *
* @see org.apache.sis.internal.referencing.ReferencingUtilities#getUnit(CoordinateSystem)
+ *
+ * @since 0.6
*/
public static Unit<Angle> getAngularUnit(final CoordinateSystem cs, Unit<Angle> unit) {
if (cs != null) {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/AxisNames.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -30,8 +30,8 @@ import org.apache.sis.internal.jdk8.JDK8
* Constants for axis names specified by ISO 19111 and ISO 19162.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.6
+ * @since 0.6
* @module
*/
public final class AxisNames {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -28,14 +28,15 @@ import org.apache.sis.util.resources.Err
* method. This set is used only for mutually exclusive properties, when a collection can not have
* elements because the other property is set.
*
- * @param <E> the type of elements that the collection would have if it was non-empty.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
+ *
+ * @param <E> the type of elements that the collection would have if it was non-empty.
*
* @see Collections#emptySet()
+ *
+ * @since 0.3
+ * @module
*/
public final class ExcludedSet<E> extends AbstractSet<E> implements Serializable {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -33,12 +33,13 @@ import org.apache.sis.util.ArgumentCheck
* This adapter is used for implementation of deprecated methods in the {@link org.apache.sis.metadata.iso}
* sub-packages, usually when the deprecation is the result of upgrading from an older to a newer ISO standard.
*
- * @param <L> the legacy type.
- * @param <N> the new type.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ *
+ * @param <L> the legacy type.
+ * @param <N> the new type.
+ *
+ * @since 0.5
* @module
*/
public abstract class LegacyPropertyAdapter<L,N> extends AbstractCollection<L> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Merger.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -65,8 +65,8 @@ import org.apache.sis.internal.jdk8.JDK8
* @author Johann Sorel (Geomatys)
* @author Benjamin Garcia (Geomatys)
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public class Merger {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataTypes.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -42,8 +42,8 @@ import org.opengis.metadata.spatial.Geor
* This class is declared in the {@code META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration} file.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
public final class MetadataTypes extends TypeRegistration {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -31,8 +31,8 @@ import org.apache.sis.internal.util.Util
* Miscellaneous utility methods for metadata.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
public final class MetadataUtilities extends Static {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameMeaning.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -39,13 +39,14 @@ import org.apache.sis.metadata.iso.citat
* The meaning are defined by <cite>OGC Naming Authority</cite> (OGCNA) or other OGC sources.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.5
* @version 0.7
- * @module
*
* @see org.apache.sis.internal.util.DefinitionURI
* @see <a href="http://www.opengeospatial.org/ogcna">http://www.opengeospatial.org/ogcna</a>
* @see <a href="http://portal.opengeospatial.org/files/?artifact_id=24045">Definition identifier URNs in OGC namespace</a>
+ *
+ * @since 0.5
+ * @module
*/
public final class NameMeaning extends Static {
/**
@@ -150,9 +151,9 @@ public final class NameMeaning extends S
* @param code the code.
* @return an identifier using the URN syntax, or {@code null} if a mandatory information is missing.
*
- * @since 0.7
- *
* @see DefinitionURI#format(String, String, String, String)
+ *
+ * @since 0.7
*/
public static String toURN(final Class<?> type, final String authority, String version, String code) {
if (type != null && authority != null && code != null) {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/NameToIdentifier.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -41,8 +41,8 @@ import static org.apache.sis.util.Charac
* Current version does not yet work with URN or HTTP syntax.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.7
+ * @since 0.4
* @module
*/
public final class NameToIdentifier implements Identifier {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -36,8 +36,8 @@ import org.apache.sis.util.collection.Co
* are for those remaining elements and are created by the {@link #filter(Collection)} method.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.5
* @version 0.5
+ * @since 0.5
* @module
*/
public final class OtherLocales extends AbstractCollection<Locale> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/RecordSchemaSIS.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -26,8 +26,8 @@ import org.apache.sis.util.iso.DefaultRe
* The system-wide schema in the "SIS" namespace.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
final class RecordSchemaSIS extends DefaultRecordSchema implements Serializable {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ReferencingServices.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -72,8 +72,8 @@ import org.apache.sis.util.Deprecable;
* <cite>"referencing by coordinates"</cite> but needed by metadata.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
public class ReferencingServices extends OptionalDependency {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -29,8 +29,8 @@ import org.opengis.util.CodeList;
* For now GeoAPI does not yet provides it, but this choice may be revisited in a future GeoAPI version.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
@UML(identifier = "MI_SensorTypeCode", specification = Specification.ISO_19115_2) // Actually only in XML schema.
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ServicesForUtility.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -49,8 +49,8 @@ import static java.util.Collections.sing
* Implements the metadata services needed by the {@code "sis-utility"} module.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.8
+ * @since 0.6
* @module
*/
public final class ServicesForUtility extends MetadataServices {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/TransformationAccuracy.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -34,8 +34,8 @@ import org.apache.sis.util.Static;
* Creates a record reporting coordinate transformation accuracy.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.8
+ * @since 0.7
* @module
*/
public final class TransformationAccuracy extends Static {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/VerticalDatumTypes.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -38,8 +38,8 @@ import org.apache.sis.util.Characters;
* This implementation convenience may change in any future SIS version.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.4
* @version 0.7
+ * @since 0.4
* @module
*/
public final class VerticalDatumTypes implements CodeList.Filter {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/WKTKeywords.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/WKTKeywords.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/WKTKeywords.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/WKTKeywords.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -35,12 +35,13 @@ import org.apache.sis.util.Static;
*
* @author Martin Desruisseaux (Geomatys)
* @author Johann Sorel (Geomatys)
- * @since 0.6
* @version 0.7
- * @module
*
* @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html">WKT 2 specification</a>
* @see <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html">Legacy WKT 1</a>
+ *
+ * @since 0.6
+ * @module
*/
public final class WKTKeywords extends Static {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -24,8 +24,8 @@
* may change in incompatible ways in any future version without notice.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.7
+ * @since 0.3
* @module
*/
package org.apache.sis.internal.metadata;
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Dialect.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -26,8 +26,8 @@ import org.apache.sis.util.CharSequences
* that can not (to our knowledge) be inferred from the {@link DatabaseMetaData}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
enum Dialect {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/Initializer.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -59,8 +59,8 @@ import org.apache.sis.util.logging.Loggi
* }
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.8
+ * @since 0.7
* @module
*/
public abstract class Initializer {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -26,8 +26,8 @@ import java.util.StringTokenizer;
* This class is for internal purpose only and may change or be removed in any future SIS version.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public class SQLBuilder {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLUtilities.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -34,8 +34,8 @@ import org.apache.sis.util.resources.Err
* This class is for Apache SIS internal usage and may change in any future version.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.8
+ * @since 0.7
* @module
*/
public final class SQLUtilities extends Static {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/ScriptRunner.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -53,8 +53,8 @@ import org.apache.sis.internal.jdk8.BiFu
* functionalities other than what we need for those scripts.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.8
+ * @since 0.7
* @module
*/
public class ScriptRunner implements AutoCloseable {
@@ -463,7 +463,7 @@ public class ScriptRunner implements Aut
* @throws SQLException if an error occurred while executing a SQL statement.
*/
public final int run(final Class<?> loader, final String filename) throws IOException, SQLException {
- try (final BufferedReader in = new LineNumberReader(new InputStreamReader(loader.getResourceAsStream(filename), "UTF-8"))) {
+ try (BufferedReader in = new LineNumberReader(new InputStreamReader(loader.getResourceAsStream(filename), "UTF-8"))) {
return run(filename, in);
}
}
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/TypeMapper.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -24,8 +24,8 @@ import java.sql.Types;
* Maps a few basic Java types to JDBC types.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public final class TypeMapper {
@@ -40,7 +40,7 @@ public final class TypeMapper {
new TypeMapper(Boolean.class, Types.BOOLEAN, "BOOLEAN"),
new TypeMapper(Date .class, Types.TIMESTAMP, "TIMESTAMP"),
new TypeMapper(Double .class, Types.DOUBLE, "DOUBLE PRECISION"),
- new TypeMapper(Float .class, Types.REAL , "REAL"),
+ new TypeMapper(Float .class, Types.REAL, "REAL"),
new TypeMapper(Long .class, Types.BIGINT, "BIGINT"),
new TypeMapper(Integer.class, Types.INTEGER, "INTEGER"),
new TypeMapper(Short .class, Types.SMALLINT, "SMALLINT"),
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -72,8 +72,8 @@
* </ol>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.7
* @version 0.7
+ * @since 0.7
* @module
*/
package org.apache.sis.internal.metadata.sql;
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/AbstractParser.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -57,8 +57,8 @@ import static org.apache.sis.util.Argume
*
* @author R�mi Eve (IRD)
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.6
* @version 0.8
+ * @since 0.6
* @module
*/
abstract class AbstractParser implements Parser {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Colors.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -36,12 +36,13 @@ import org.apache.sis.util.resources.Err
* The above list may be expanded in any future SIS version.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.4
- * @module
*
* @see WKTFormat#getColors()
* @see WKTFormat#setColors(Colors)
+ *
+ * @since 0.4
+ * @module
*/
public class Colors implements Cloneable, Serializable {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Convention.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -49,12 +49,13 @@ import org.apache.sis.metadata.iso.citat
* but should be avoided when not imposed by compatibility reasons.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.6
- * @module
*
* @see WKTFormat#getConvention()
* @see WKTFormat#setConvention(Convention)
+ *
+ * @since 0.4
+ * @module
*/
public enum Convention {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Element.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -56,8 +56,8 @@ import org.apache.sis.internal.jdk8.JDK8
*
* @author R�mi �ve (IRD)
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.6
* @version 0.6
+ * @since 0.6
* @module
*/
final class Element implements Serializable {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/ElementKind.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -33,8 +33,8 @@ import org.apache.sis.util.Numbers;
* Different kinds of elements can be associated to different {@linkplain Colors colors}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.4
+ * @since 0.4
* @module
*/
public enum ElementKind {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/FormattableObject.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -60,12 +60,13 @@ import org.apache.sis.internal.util.Cons
* </ul>
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.4
* @version 0.6
- * @module
*
* @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html">WKT 2 specification</a>
* @see <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html">Legacy WKT 1</a>
+ *
+ * @since 0.4
+ * @module
*/
@XmlTransient
public abstract class FormattableObject {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -97,12 +97,13 @@ import org.apache.sis.metadata.iso.exten
* </ul>
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.4
* @version 0.8
- * @module
*
* @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html">WKT 2 specification</a>
* @see <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html">Legacy WKT 1</a>
+ *
+ * @since 0.4
+ * @module
*/
public class Formatter implements Localized {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -89,8 +89,8 @@ import static java.util.Collections.sing
* @author R�mi Eve (IRD)
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Johann Sorel (Geomatys)
- * @since 0.6
* @version 0.8
+ * @since 0.6
* @module
*/
class GeodeticObjectParser extends MathTransformParser implements Comparator<CoordinateSystemAxis> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordCase.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -38,8 +38,8 @@ package org.apache.sis.io.wkt;
* {@code keyword} is equivalent to {@code KeyWord} and to {@code kEYwORd}.</div>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.6
+ * @since 0.4
* @module
*/
public enum KeywordCase {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordStyle.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordStyle.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordStyle.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/KeywordStyle.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,8 +27,8 @@ package org.apache.sis.io.wkt;
* </div>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.6
+ * @since 0.6
* @module
*/
public enum KeywordStyle {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/MathTransformParser.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -55,11 +55,12 @@ import static org.apache.sis.util.Argume
* @author R�mi Eve (IRD)
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Rueben Schulz (UBC)
- * @since 0.6
* @version 0.8
- * @module
*
* @see <a href="http://www.geoapi.org/snapshot/javadoc/org/opengis/referencing/doc-files/WKT.html">Well Know Text specification</a>
+ *
+ * @since 0.6
+ * @module
*/
class MathTransformParser extends AbstractParser {
/**
@@ -265,7 +266,7 @@ class MathTransformParser extends Abstra
final void parseParameters(final Element element, final ParameterValueGroup parameters,
final Unit<?> defaultUnit, final Unit<Angle> defaultAngularUnit) throws ParseException
{
- final Unit<?> defaultSI = (defaultUnit != null) ? defaultUnit.getSystemUnit(): null;
+ final Unit<?> defaultSI = (defaultUnit != null) ? defaultUnit.getSystemUnit() : null;
Element param = element;
try {
while ((param = element.pullElement(OPTIONAL, WKTKeywords.Parameter)) != null) {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Parser.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -38,8 +38,8 @@ import org.opengis.util.FactoryException
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.6
+ * @since 0.6
* @module
*/
public interface Parser {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Symbols.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -67,12 +67,13 @@ import static org.apache.sis.util.Argume
* Users can create their own {@code Symbols} instance for parsing or formatting a WKT with different symbols.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.4
* @version 0.6
- * @module
*
* @see WKTFormat#getSymbols()
* @see WKTFormat#setSymbols(Symbols)
+ *
+ * @since 0.4
+ * @module
*/
public class Symbols implements Localized, Cloneable, Serializable {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Transliterator.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -89,12 +89,13 @@ import org.apache.sis.util.Characters;
* methods are responsible for doing the transliteration at formatting and parsing time, respectively.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.6
- * @module
*
* @see org.apache.sis.util.Characters#isValidWKT(int)
* @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#39">WKT 2 specification �7.5.3</a>
+ *
+ * @since 0.6
+ * @module
*/
public abstract class Transliterator implements Serializable {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnformattableObjectException.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -32,11 +32,12 @@ import org.opengis.referencing.Identifie
* {@code append(\u2026)} method is an instance of an unsupported class.
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.4
* @version 0.4
- * @module
*
* @see Formatter#setInvalidWKT(IdentifiedObject, Exception)
+ *
+ * @since 0.4
+ * @module
*/
public class UnformattableObjectException extends UnsupportedOperationException {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnparsableObjectException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnparsableObjectException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnparsableObjectException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/UnparsableObjectException.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -38,8 +38,8 @@ import org.apache.sis.util.LocalizedExce
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
public class UnparsableObjectException extends ParseException implements LocalizedException {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/VerticalInfo.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -52,8 +52,8 @@ import org.apache.sis.metadata.iso.exten
* {@link org.apache.sis.metadata.iso.extent.Extents#getVerticalRange}</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.6
+ * @since 0.6
* @module
*/
final class VerticalInfo {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/WKTFormat.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -109,12 +109,13 @@ import org.apache.sis.internal.jdk8.JDK8
*
* @author Martin Desruisseaux (Geomatys)
* @author R�mi Eve (IRD)
- * @since 0.4
* @version 0.8
- * @module
*
* @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html">WKT 2 specification</a>
* @see <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html">Legacy WKT 1</a>
+ *
+ * @since 0.4
+ * @module
*/
public class WKTFormat extends CompoundFormat<Object> {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Warnings.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -69,11 +69,12 @@ import org.apache.sis.util.resources.Voc
* </div>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.6
* @version 0.6
- * @module
*
* @see WKTFormat#getWarnings()
+ *
+ * @since 0.6
+ * @module
*/
public final class Warnings implements Localized, Serializable {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/package-info.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -82,11 +82,12 @@
* @author Martin Desruisseaux (IRD, Geomatys)
* @author R�mi Eve (IRD)
* @author Rueben Schulz (UBC)
- * @since 0.4
* @version 0.6
- * @module
*
* @see <a href="http://docs.opengeospatial.org/is/12-063r5/12-063r5.html">WKT 2 specification</a>
* @see <a href="http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html">Legacy WKT 1</a>
+ *
+ * @since 0.4
+ * @module
*/
package org.apache.sis.io.wkt;
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -70,11 +70,12 @@ import org.apache.sis.util.collection.Tr
* use a single lock for the whole metadata tree (including children).
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
- * @module
*
* @see MetadataStandard
+ *
+ * @since 0.3
+ * @module
*/
@XmlTransient
public abstract class AbstractMetadata implements LenientComparable, Emptiable {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/CacheKey.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/CacheKey.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/CacheKey.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/CacheKey.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,8 +25,8 @@ import org.apache.sis.util.resources.Err
* A key in the {@link MetadataStandard} internal cache.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
+ * @since 0.8
* @module
*/
final class CacheKey {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/DomainRange.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -28,14 +28,15 @@ import org.apache.sis.measure.ValueRange
* in order to make possible to return this range from the {@link PropertyInformation#getDomainValue()}
* method.
*
- * @param <E> the type of range elements as a subclass of {@link Number}.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
+ *
+ * @param <E> the type of range elements as a subclass of {@link Number}.
*
* @see PropertyInformation#getDomainValue()
+ *
+ * @since 0.3
+ * @module
*/
final class DomainRange<E extends Number & Comparable<? super E>> extends NumberRange<E>
implements InternationalString
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Freezer.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -35,8 +35,8 @@ import org.apache.sis.metadata.iso.ident
* tries to avoid creating new clones as much as possible.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class Freezer extends Cloner {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InformationMap.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -27,12 +27,13 @@ import org.opengis.metadata.ExtendedElem
* All values in this map are instances of {@link PropertyInformation}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
*
* @see PropertyInformation
* @see MetadataStandard#asInformationMap(Class, KeyNamePolicy)
+ *
+ * @since 0.3
+ * @module
*/
final class InformationMap extends PropertyMap<ExtendedElementInformation> {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/InvalidMetadataException.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -21,8 +21,8 @@ package org.apache.sis.metadata;
* Thrown when a metadata is in a invalid state or has illegal property values.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
public class InvalidMetadataException extends IllegalStateException {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -31,11 +31,12 @@ import org.opengis.annotation.UML;
* {@code UML_IDENTIFIER} usually stay singular no matter the property cardinality.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
*
* @see MetadataStandard#asValueMap(Object, Class, KeyNamePolicy, ValueExistencePolicy)
+ *
+ * @since 0.3
+ * @module
*/
public enum KeyNamePolicy {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataCopier.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -79,11 +79,12 @@ import org.apache.sis.util.collection.Co
* static methods in each {@code AbstractMetadata} subclass are sometime sufficient.</p>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.8
* @version 0.8
- * @module
*
* @see ModifiableMetadata#unmodifiable()
+ *
+ * @since 0.8
+ * @module
*/
public class MetadataCopier {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -93,11 +93,12 @@ import org.apache.sis.internal.jdk8.BiFu
* by a large amount of {@link ModifiableMetadata}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
- * @module
*
* @see AbstractMetadata
+ *
+ * @since 0.3
+ * @module
*/
public class MetadataStandard implements Serializable {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -82,8 +82,8 @@ import static org.apache.sis.util.collec
* (typically after its construction is completed) by the call to the {@link #freeze()} method.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
@XmlTransient
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/NameMap.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,11 +25,12 @@ import java.util.NoSuchElementException;
* Map of property names for a given implementation class. This map is read-only.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
*
* @see MetadataStandard#asNameMap(Class, KeyNamePolicy, KeyNamePolicy)
+ *
+ * @since 0.3
+ * @module
*/
final class NameMap extends PropertyMap<String> {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ObjectPair.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -29,8 +29,8 @@ import org.apache.sis.util.Classes;
* Object order is not significant.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
final class ObjectPair {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -80,8 +80,8 @@ import static org.apache.sis.util.collec
* {@link ModifiableMetadata} instances.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
class PropertyAccessor {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -43,8 +43,8 @@ import org.opengis.annotation.Obligation
* </ol>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class PropertyComparator implements Comparator<Method> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -51,17 +51,18 @@ import org.apache.sis.util.logging.Loggi
* <div class="section">Immutability and thread safety</div>
* This final class is immutable and thus thread-safe.
*
- * @param <E> The value type, either the method return type if not a collection,
- * or the type of elements in the collection otherwise.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.5
- * @module
+ *
+ * @param <E> the value type, either the method return type if not a collection,
+ * or the type of elements in the collection otherwise.
*
* @see InformationMap
* @see MetadataStandard#asInformationMap(Class, KeyNamePolicy)
* @see <a href="https://issues.apache.org/jira/browse/SIS-80">SIS-80</a>
+ *
+ * @since 0.3
+ * @module
*/
final class PropertyInformation<E> extends SimpleIdentifier
implements ExtendedElementInformation, CheckedContainer<E>
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyMap.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -29,17 +29,18 @@ import java.util.Iterator;
* The map values depend on the actual {@code PropertyMap} subclasses; they may be
* property values, property classes or property information.
*
- * @param <V> The type of values in the map.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
+ *
+ * @param <V> the type of values in the map.
*
* @see ValueMap
* @see NameMap
* @see TypeMap
* @see InformationMap
+ *
+ * @since 0.3
+ * @module
*/
abstract class PropertyMap<V> extends AbstractMap<String,V> {
/**
@@ -112,8 +113,8 @@ abstract class PropertyMap<V> extends Ab
* The iterator over the elements contained in a {@link Entries} set.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
abstract class Iter implements Iterator<Map.Entry<String,V>> {
@@ -152,8 +153,8 @@ abstract class PropertyMap<V> extends Ab
* Base class of views of the entries contained in the map.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
class Entries extends AbstractSet<Map.Entry<String,V>> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -30,8 +30,8 @@ import static org.apache.sis.metadata.Va
* Implementation of {@link AbstractMetadata#isEmpty()} and {@link ModifiableMetadata#prune()} methods.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class Pruner {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/RecursivityGuard.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -34,16 +34,17 @@ import java.util.IdentityHashMap;
* would not suit since it invokes {@code equals(Object)} and {@code hashCode()}, which are precisely
* the methods that we want to avoid invoking twice.
*
- * @param <V> the kind of values to store in the maps.
- *
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
+ *
+ * @param <V> the kind of values to store in the maps.
*
* @see #HASH_CODES
* @see ObjectPair#CURRENT
* @see Pruner#MAPS
+ *
+ * @since 0.3
+ * @module
*/
final class RecursivityGuard<V> extends ThreadLocal<Map<Object,V>> {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/SpecialCases.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -30,8 +30,8 @@ import org.apache.sis.util.collection.Ba
* {@link Latitude} instances instead of {@link Double}.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.4
* @version 0.8
+ * @since 0.4
* @module
*/
final class SpecialCases extends PropertyAccessor {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/StandardImplementation.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -31,8 +31,8 @@ import org.apache.sis.internal.system.Mo
* Information about an Apache SIS metadata standard implementation.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
final class StandardImplementation extends MetadataStandard {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNode.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -59,8 +59,8 @@ import org.apache.sis.util.resources.Voc
* order depends on the instantiation order).</div>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
class TreeNode implements Node {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeNodeChildren.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -46,8 +46,8 @@ import org.apache.sis.util.Debug;
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class TreeNodeChildren extends AbstractCollection<TreeTable.Node> {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TreeTableView.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -45,8 +45,8 @@ import org.apache.sis.internal.system.Se
* </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.8
+ * @since 0.3
* @module
*/
final class TreeTableView implements TreeTable, Serializable {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeMap.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -25,11 +25,12 @@ import java.util.NoSuchElementException;
* Map of property valuePolicy for a given implementation class. This map is read-only.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
*
* @see MetadataStandard#asTypeMap(Class, KeyNamePolicy, TypeValuePolicy)
+ *
+ * @since 0.3
+ * @module
*/
final class TypeMap extends PropertyMap<Class<?>> {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeValuePolicy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeValuePolicy.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeValuePolicy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/TypeValuePolicy.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -23,11 +23,12 @@ package org.apache.sis.metadata;
* as property types except for collections) or the declaring classes.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.3
- * @module
*
* @see MetadataStandard#asTypeMap(Class, KeyNamePolicy, TypeValuePolicy)
+ *
+ * @since 0.3
+ * @module
*/
public enum TypeValuePolicy {
/**
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/UnmodifiableMetadataException.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -29,8 +29,8 @@ package org.apache.sis.metadata;
* </ul>
*
* @author Martin Desruisseaux (IRD, Geomatys)
- * @since 0.3
* @version 0.3
+ * @since 0.3
* @module
*/
public class UnmodifiableMetadataException extends UnsupportedOperationException {
Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java?rev=1789948&r1=1789947&r2=1789948&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java [UTF-8] Mon Apr 3 10:57:47 2017
@@ -38,11 +38,12 @@ import org.apache.sis.xml.NilReason;
* Those explanations can be obtained by calls to the {@link org.apache.sis.xml.NilReason#forObject(Object)} method.
*
* @author Martin Desruisseaux (Geomatys)
- * @since 0.3
* @version 0.4
- * @module
*
* @see MetadataStandard#asValueMap(Object, Class, KeyNamePolicy, ValueExistencePolicy)
+ *
+ * @since 0.3
+ * @module
*/
public enum ValueExistencePolicy {
/**