sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1652031 - in /sis/trunk: ./ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-referencing/src/main/java/org/apache/sis/referencing/
Date Thu, 15 Jan 2015 10:17:23 GMT
Author: desruisseaux
Date: Thu Jan 15 10:17:22 2015
New Revision: 1652031

URL: http://svn.apache.org/r1652031
Log:
Merge from the JDK6 branch (mostly documentation updates).

Modified:
    sis/trunk/   (props changed)
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 15 10:17:22 2015
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1651615
-/sis/branches/JDK7:1394913-1651598
-/sis/branches/JDK8:1584960-1651592
+/sis/branches/JDK6:1394364-1652025
+/sis/branches/JDK7:1394913-1652022
+/sis/branches/JDK8:1584960-1652019

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1652031&r1=1652030&r2=1652031&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
[UTF-8] Thu Jan 15 10:17:22 2015
@@ -276,8 +276,12 @@ public abstract class AbstractAttribute<
      * all the "standard" characteristics and need no special processing.</div>
      *
      * {@section Reading a characteristic}
-     * If an attribute is known to be a measurement with a characteristic named "accuracy"
of type {@link Float},
-     * then the accuracy value could be read as below:
+     * The characteristic values are enumerated in the {@linkplain Map#values() map values}.
+     * The {@linkplain Map#keySet() map keys} are the {@code String} representations of characteristics
+     * {@linkplain DefaultAttributeType#getName() name}, for more convenient lookups.
+     *
+     * <p>If an attribute is known to be a measurement with a characteristic named
"accuracy"
+     * of type {@link Float}, then the accuracy value could be read as below:</p>
      *
      * {@preformat java
      *     Float getAccuracy(Attribute<?> measurement) {
@@ -324,7 +328,7 @@ public abstract class AbstractAttribute<
      *     }</li>
      * </ol>
      *
-     * @return Other attribute types that describes this attribute type, or an empty set
if none.
+     * @return Other attribute types that describes this attribute type, or an empty map
if none.
      *
      * @see DefaultAttributeType#characteristics()
      */

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java?rev=1652031&r1=1652030&r2=1652031&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8]
(original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8]
Thu Jan 15 10:17:22 2015
@@ -124,6 +124,7 @@ public abstract class AbstractFeature im
      * @throws IllegalArgumentException If the given argument is not a property name of this
feature.
      *
      * @see #getPropertyValue(String)
+     * @see DefaultFeatureType#getProperty(String)
      */
     public abstract Object getProperty(final String name) throws IllegalArgumentException;
 

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java?rev=1652031&r1=1652030&r2=1652031&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
[UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
[UTF-8] Thu Jan 15 10:17:22 2015
@@ -68,6 +68,8 @@ import org.apache.sis.internal.jdk7.Obje
  * (e.g. air temperature) may have another attribute that holds the measurement accuracy
(e.g. ±0.1°C).
  * The accuracy value is often constant for all instances of that attribute
  * (e.g. for all temperature measurements in the same dataset), but this is not mandatory.
+ *
+ * <div class="note"><b>Design note:</b>
  * Such accuracy could be stored as an ordinary, independent, attribute (like an other column
in a table),
  * but storing accuracy as a {@linkplain #characteristics() characteristic} of the measurement
attribute instead
  * provides the following advantages:
@@ -80,6 +82,7 @@ import org.apache.sis.internal.jdk7.Obje
  *   <li>In the common case of a {@linkplain DefaultFeatureType#isSimple() simple feature}
with characteristics
  *       that are constants, declaring them as attribute characteristics allows to specify
the constants only once.</li>
  * </ul>
+ * </div>
  *
  * Constant values of characteristics are given by their {@linkplain #getDefaultValue() default
value}.
  * It is still possible for any specific {@code Attribute} instance to specify their own
value,
@@ -292,7 +295,11 @@ public class DefaultAttributeType<V> ext
      * shall hold that constant.
      * </div>
      *
-     * @return Other attribute types that describes this attribute type, or an empty set
if none.
+     * The characteristics are enumerated in the {@linkplain Map#values() map values}.
+     * The {@linkplain Map#keySet() map keys} are the {@code String} representations
+     * of characteristics {@linkplain #getName() name}, for more convenient lookups.
+     *
+     * @return Other attribute types that describes this attribute type, or an empty map
if none.
      *
      * @see AbstractAttribute#characteristics()
      */

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1652031&r1=1652030&r2=1652031&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
[UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
[UTF-8] Thu Jan 15 10:17:22 2015
@@ -655,6 +655,8 @@ public class DefaultFeatureType extends
      * @param  name The name of the property to search.
      * @return The property for the given name, or {@code null} if none.
      * @throws IllegalArgumentException If the given argument is not a property name of this
feature.
+     *
+     * @see AbstractFeature#getProperty(String)
      */
     public AbstractIdentifiedType getProperty(final String name) throws IllegalArgumentException
{
         final AbstractIdentifiedType pt = byName.get(name);

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1652031&r1=1652030&r2=1652031&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
[UTF-8] Thu Jan 15 10:17:22 2015
@@ -467,7 +467,7 @@ public class AbstractIdentifiedObject ex
         if (identifiers != null) {
             for (final ReferenceIdentifier identifier : identifiers) {
                 if (appendUnicodeIdentifier(id, '-', identifier.getCodeSpace(), ":", true)
| // Really |, not ||
-appendUnicodeIdentifier(id, '-', NameMeaning.toObjectType(getClass()), ":", false) |
+                    appendUnicodeIdentifier(id, '-', NameMeaning.toObjectType(getClass()),
":", false) |
                     appendUnicodeIdentifier(id, '-', identifier.getCode(), ":", true))
                 {
                     /*



Mime
View raw message