Author: desruisseaux
Date: Mon Mar 4 16:16:29 2013
New Revision: 1452366
URL: http://svn.apache.org/r1452366
Log:
Renamed "NullValuePolicy" as "ValueExistencePolicy", which matches better the
enumeration purpose.
Added:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
- copied, changed from r1452359,
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/NullValuePolicy.java
Removed:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/NullValuePolicy.java
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java?rev=1452366&r1=1452365&r2=1452366&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/KeyNamePolicy.java
[UTF-8] Mon Mar 4 16:16:29 2013
@@ -35,7 +35,7 @@ import org.opengis.annotation.UML;
* @version 0.3
* @module
*
- * @see MetadataStandard#asMap(Object, KeyNamePolicy, NullValuePolicy)
+ * @see MetadataStandard#asMap(Object, KeyNamePolicy, ValueExistencePolicy)
*/
public enum KeyNamePolicy {
/**
Modified:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java?rev=1452366&r1=1452365&r2=1452366&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyDescriptor.java
[UTF-8] Mon Mar 4 16:16:29 2013
@@ -43,7 +43,7 @@ import java.util.Objects;
* For a given metadata instances (typically an {@link AbstractMetadata}
subclasses,
* but other types are allowed), instances of {@code PropertyDescriptor} are
obtained
* indirectly by the {@link MetadataStandard#asDescriptorMap(Object,
KeyNamePolicy,
- * NullValuePolicy)} method.
+ * ValueExistencePolicy)} method.
*
* @param <T> The value type, either the method return type if not a
collection,
* or the type of elements in the collection otherwise.
@@ -53,7 +53,7 @@ import java.util.Objects;
* @version 0.3
* @module
*
- * @see MetadataStandard#asDescriptorMap(Object, KeyNamePolicy,
NullValuePolicy)
+ * @see MetadataStandard#asDescriptorMap(Object, KeyNamePolicy,
ValueExistencePolicy)
* @see <a href="https://issues.apache.org/jira/browse/SIS-80">SIS-80</a>
*
* @todo Implementing {@code ParameterDescriptor} is not really appropriate
since metadata properties
Copied:
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
(from r1452359,
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/NullValuePolicy.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java?p2=sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java&p1=sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/NullValuePolicy.java&r1=1452359&r2=1452366&rev=1452366&view=diff
==============================================================================
---
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/NullValuePolicy.java
[UTF-8] (original)
+++
sis/branches/JDK7/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
[UTF-8] Mon Mar 4 16:16:29 2013
@@ -29,9 +29,9 @@ package org.apache.sis.metadata;
* @version 0.3
* @module
*
- * @see MetadataStandard#asMap(Object, KeyNamePolicy, NullValuePolicy)
+ * @see MetadataStandard#asMap(Object, KeyNamePolicy, ValueExistencePolicy)
*/
-public enum NullValuePolicy {
+public enum ValueExistencePolicy {
/**
* Includes all entries in the map, including those having a null value or
an
* empty collection.