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 2013/07/09 11:30:49 UTC
svn commit: r1501161 [3/3] - in /sis/branches/0.3: ./ application/
application/sis-console/ application/sis-webapp/ core/sis-build-helper/
core/sis-build-helper/src/site/apt/ core/sis-metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/is...
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -375,6 +375,8 @@ public class AbstractElement extends ISO
/**
* Returns the name of the test applied to the data.
+ *
+ * @return Name of the test applied to the data.
*/
@Override
@XmlElement(name = "nameOfMeasure")
@@ -393,6 +395,8 @@ public class AbstractElement extends ISO
/**
* Returns the code identifying a registered standard procedure, or {@code null} if none.
+ *
+ * @return Code identifying a registered standard procedure, or {@code null}.
*/
@Override
@XmlElement(name = "measureIdentification")
@@ -412,6 +416,8 @@ public class AbstractElement extends ISO
/**
* Returns the description of the measure being determined.
+ *
+ * @return Description of the measure being determined, or {@code null}.
*/
@Override
@XmlElement(name = "measureDescription")
@@ -430,8 +436,9 @@ public class AbstractElement extends ISO
}
/**
- * Returns the type of method used to evaluate quality of the dataset,
- * or {@code null} if unspecified.
+ * Returns the type of method used to evaluate quality of the dataset.
+ *
+ * @return Type of method used to evaluate quality, or {@code null}.
*/
@Override
@XmlElement(name = "evaluationMethodType")
@@ -451,6 +458,8 @@ public class AbstractElement extends ISO
/**
* Returns the description of the evaluation method.
+ *
+ * @return Description of the evaluation method, or {@code null}.
*/
@Override
@XmlElement(name = "evaluationMethodDescription")
@@ -470,6 +479,8 @@ public class AbstractElement extends ISO
/**
* Returns the reference to the procedure information, or {@code null} if none.
+ *
+ * @return Reference to the procedure information, or {@code null}.
*/
@Override
@XmlElement(name = "evaluationProcedure")
@@ -491,6 +502,8 @@ public class AbstractElement extends ISO
* Returns the date or range of dates on which a data quality measure was applied.
* The collection size is 1 for a single date, or 2 for a range.
* Returns an empty collection if this information is not available.
+ *
+ * @return Date or range of dates on which a data quality measure was applied.
*/
@Override
@XmlElement(name = "dateTime")
@@ -536,6 +549,8 @@ public class AbstractElement extends ISO
* Returns the value (or set of values) obtained from applying a data quality measure or
* the out come of evaluating the obtained value (or set of values) against a specified
* acceptable conformance quality level.
+ *
+ * @return Set of values obtained from applying a data quality measure.
*/
@Override
@XmlElement(name = "result", required = true)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -133,8 +133,9 @@ public class DefaultConformanceResult ex
}
/**
- * Returns the citation of product specification or user
- * requirement against which data is being evaluated.
+ * Returns the citation of product specification or user requirement against which data is being evaluated.
+ *
+ * @return Citation of product specification or user requirement, or {@code null}.
*/
@Override
@XmlElement(name = "specification", required = true)
@@ -143,8 +144,7 @@ public class DefaultConformanceResult ex
}
/**
- * Sets the citation of product specification or user requirement against which data
- * is being evaluated.
+ * Sets the citation of product specification or user requirement against which data is being evaluated.
*
* @param newValue The new specification.
*/
@@ -155,6 +155,8 @@ public class DefaultConformanceResult ex
/**
* Returns the explanation of the meaning of conformance for this result.
+ *
+ * @return Explanation of the meaning of conformance, or {@code null}.
*/
@Override
@XmlElement(name = "explanation", required = true)
@@ -174,6 +176,8 @@ public class DefaultConformanceResult ex
/**
* Returns an indication of the conformance result.
+ *
+ * @return Indication of the conformance result, or {@code null}.
*/
@Override
public Boolean pass() {
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -130,6 +130,8 @@ public class DefaultCoverageResult exten
/**
* Returns the method used to spatially represent the coverage result.
+ *
+ * @return Spatial representation of the coverage result, or {@code null}.
*/
@Override
@XmlElement(name = "spatialRepresentationType", namespace = Namespaces.GMI, required = true)
@@ -149,6 +151,8 @@ public class DefaultCoverageResult exten
/**
* Returns the digital representation of data quality measures composing the coverage result.
+ *
+ * @return Digital representation of data quality measures composing the coverage result, or {@code null}.
*/
@Override
@XmlElement(name = "resultSpatialRepresentation", namespace = Namespaces.GMI, required = true)
@@ -169,6 +173,8 @@ public class DefaultCoverageResult exten
/**
* Returns the description of the content of the result coverage, i.e. semantic definition
* of the data quality measures.
+ *
+ * @return Description of the content of the result coverage, or {@code null}.
*/
@Override
@XmlElement(name = "resultContentDescription", namespace = Namespaces.GMI, required = true)
@@ -189,6 +195,8 @@ public class DefaultCoverageResult exten
/**
* Returns the information about the format of the result coverage data.
+ *
+ * @return Format of the result coverage data, or {@code null}.
*/
@Override
@XmlElement(name = "resultFormat", namespace = Namespaces.GMI, required = true)
@@ -208,6 +216,8 @@ public class DefaultCoverageResult exten
/**
* Returns the information about the data file containing the result coverage data.
+ *
+ * @return Data file containing the result coverage data, or {@code null}.
*/
@Override
@XmlElement(name = "resultFile", namespace = Namespaces.GMX, required = true)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -131,6 +131,8 @@ public class DefaultDataQuality extends
/**
* Returns the specific data to which the data quality information applies.
+ *
+ * @return The specific data to which the data quality information applies, or {@code null}.
*/
@Override
@XmlElement(name = "scope", required = true)
@@ -151,7 +153,7 @@ public class DefaultDataQuality extends
/**
* Returns the quantitative quality information for the data specified by the scope.
*
- * @return The quantitative quality information.
+ * @return Quantitative quality information for the data.
*/
@Override
@XmlElement(name = "report")
@@ -169,8 +171,9 @@ public class DefaultDataQuality extends
}
/**
- * Returns non-quantitative quality information about the lineage of the data specified
- * by the scope.
+ * Returns non-quantitative quality information about the lineage of the data specified by the scope.
+ *
+ * @return Non-quantitative quality information about the lineage of the data specified, or {@code null}.
*/
@Override
@XmlElement(name = "lineage")
@@ -179,8 +182,7 @@ public class DefaultDataQuality extends
}
/**
- * Sets the non-quantitative quality information about the lineage of the data specified
- * by the scope.
+ * Sets the non-quantitative quality information about the lineage of the data specified by the scope.
*
* @param newValue The new lineage.
*/
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -120,6 +120,8 @@ public class DefaultQuantitativeResult e
/**
* Returns the quantitative value or values, content determined by the evaluation procedure used.
+ *
+ * @return Quantitative value or values.
*/
@Override
// @XmlElement(name = "value", required = true) // TODO
@@ -137,7 +139,9 @@ public class DefaultQuantitativeResult e
}
/**
- * Return the value type for reporting a data quality result, or {@code null} if none.
+ * Return the value type for reporting a data quality result.
+ *
+ * @return Value type for reporting a data quality result, or {@code null}.
*/
@Override
@XmlElement(name = "valueType")
@@ -146,7 +150,7 @@ public class DefaultQuantitativeResult e
}
/**
- * Sets the value type for reporting a data quality result, or {@code null} if none.
+ * Sets the value type for reporting a data quality result.
*
* @param newValue The new value type.
*/
@@ -156,7 +160,9 @@ public class DefaultQuantitativeResult e
}
/**
- * Returns the value unit for reporting a data quality result, or {@code null} if none.
+ * Returns the value unit for reporting a data quality result.
+ *
+ * @return Value unit for reporting a data quality result, or {@code null}.
*/
@Override
@XmlElement(name = "valueUnit", required = true)
@@ -165,7 +171,7 @@ public class DefaultQuantitativeResult e
}
/**
- * Sets the value unit for reporting a data quality result, or {@code null} if none.
+ * Sets the value unit for reporting a data quality result.
*
* @param newValue The new value unit.
*/
@@ -175,7 +181,9 @@ public class DefaultQuantitativeResult e
}
/**
- * Returns the statistical method used to determine the value, or {@code null} if none.
+ * Returns the statistical method used to determine the value.
+ *
+ * @return Statistical method used to determine the value, or {@code null}.
*/
@Override
@XmlElement(name = "errorStatistic")
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -123,6 +123,8 @@ public class DefaultScope extends ISOMet
/**
* Returns the hierarchical level of the data specified by the scope.
+ *
+ * @return Hierarchical level of the data, or {@code null}.
*/
@Override
@XmlElement(name = "level", required = true)
@@ -142,6 +144,8 @@ public class DefaultScope extends ISOMet
/**
* Returns detailed descriptions about the level of the data specified by the scope.
+ *
+ * @return Detailed description about the level of the data.
*/
@Override
@XmlElement(name = "levelDescription")
@@ -159,8 +163,9 @@ public class DefaultScope extends ISOMet
}
/**
- * Information about the spatial, vertical and temporal extent of the data specified by the
- * scope.
+ * Information about the spatial, vertical and temporal extent of the data specified by the scope.
+ *
+ * @return Information about the extent of the data, or {@code null}.
*/
@Override
@XmlElement(name = "extent")
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -106,6 +106,8 @@ public class AbstractGeolocationInformat
/**
* Returns an overall assessment of quality of geolocation information.
+ *
+ * @return An overall assessment of quality of geolocation information.
*/
@Override
@XmlElement(name = "qualityInfo", namespace = Namespaces.GMI)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -126,6 +126,8 @@ public class DefaultDimension extends IS
/**
* Returns the name of the axis.
+ *
+ * @return Name of the axis, or {@code null}.
*/
@Override
@XmlElement(name = "dimensionName", required = true)
@@ -145,6 +147,8 @@ public class DefaultDimension extends IS
/**
* Returns the number of elements along the axis.
+ *
+ * @return Number of elements along the axis, or {@code null}.
*/
@Override
@ValueRange(minimum=0)
@@ -165,6 +169,8 @@ public class DefaultDimension extends IS
/**
* Returns the degree of detail in the grid dataset.
+ *
+ * @return Degree of detail in the grid dataset, or {@code null}.
*/
@Override
@ValueRange(minimum=0, isMinIncluded=false)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -108,10 +108,12 @@ public class DefaultGCP extends ISOMetad
/**
* Returns the geographic or map position of the control point, in either two or three dimensions.
*
+ * @return Geographic or map position of the control point, or {@code null}.
+ *
* @todo finish the annotation on the referencing module before.
*/
@Override
- //@XmlElement(name = "geographicCoordinates")
+ //@XmlElement(name = "geographicCoordinates", required = true)
public DirectPosition getGeographicCoordinates() {
return geographicCoordinates;
}
@@ -127,7 +129,9 @@ public class DefaultGCP extends ISOMetad
}
/**
- * Get the accuracy of a ground control point.
+ * Returns the accuracy of a ground control point.
+ *
+ * @return Accuracy of a ground control point.
*/
@Override
@XmlElement(name = "accuracyReport", namespace = Namespaces.GMI)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -121,6 +121,8 @@ public class DefaultGCPCollection extend
/**
* Returns the identifier of the GCP collection.
+ *
+ * @return The identifier, or {@code null}.
*/
@Override
@XmlElement(name = "collectionIdentification", namespace = Namespaces.GMI, required = true)
@@ -140,6 +142,8 @@ public class DefaultGCPCollection extend
/**
* Returns the name of the GCP collection.
+ *
+ * @return Name of the GCP collection, or {@code null}.
*/
@Override
@XmlElement(name = "collectionName", namespace = Namespaces.GMI, required = true)
@@ -159,6 +163,8 @@ public class DefaultGCPCollection extend
/**
* Returns the coordinate system in which the ground control points are defined.
+ *
+ * @return Coordinate system in which the ground control points are defined, or {@code null}.
*/
@Override
@XmlElement(name = "coordinateReferenceSystem", namespace = Namespaces.GMI, required = true)
@@ -178,6 +184,8 @@ public class DefaultGCPCollection extend
/**
* Returns the ground control point(s) used in the collection.
+ *
+ * @return Ground control point(s).
*/
@Override
@XmlElement(name = "gcp", namespace = Namespaces.GMI, required = true)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -116,6 +116,8 @@ public class DefaultGeometricObjects ext
/**
* Returns the total number of the point or vector object type occurring in the dataset.
+ *
+ * @return Name of spatial objects used to locate spatial locations in the dataset, or {@code null}.
*/
@Override
@XmlElement(name = "geometricObjectType", required = true)
@@ -135,6 +137,8 @@ public class DefaultGeometricObjects ext
/**
* Returns the total number of the point or vector object type occurring in the dataset.
+ *
+ * @return Total number of the point or vector object type, or {@code null}.
*/
@Override
@ValueRange(minimum=0)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -177,6 +177,8 @@ public class DefaultGeorectified extends
/**
* Returns an indication of whether or not geographic position points are available to test the
* accuracy of the georeferenced grid data.
+ *
+ * @return Whether or not geographic position points are available to test accuracy.
*/
@Override
@XmlElement(name = "checkPointAvailability", required = true)
@@ -212,6 +214,8 @@ public class DefaultGeorectified extends
* Returns a description of geographic position points used to test the accuracy of the
* georeferenced grid data. This value is non-null only if {@link #isCheckPointAvailable()}
* returns {@code true}.
+ *
+ * @return Description of geographic position points used to test accuracy, or {@code null}.
*/
@Override
@XmlElement(name = "checkPointDescription")
@@ -242,6 +246,8 @@ public class DefaultGeorectified extends
* and the grid coordinate of the cells at opposite ends of grid coverage along two
* diagonals in the grid spatial dimensions. There are four corner points in a
* georectified grid; at least two corner points along one diagonal are required.
+ *
+ * @return The corner points.
*/
@Override
@XmlElement(name = "cornerPoints", required = true)
@@ -262,6 +268,8 @@ public class DefaultGeorectified extends
* Returns the Earth location in the coordinate system defined by the Spatial Reference System
* and the grid coordinate of the cell halfway between opposite ends of the grid in the
* spatial dimensions.
+ *
+ * @return The center point, or {@code null}.
*/
@Override
@XmlElement(name = "centerPoint")
@@ -281,6 +289,8 @@ public class DefaultGeorectified extends
/**
* Returns the point in a pixel corresponding to the Earth location of the pixel.
+ *
+ * @return Earth location of the pixel, or {@code null}.
*/
@Override
@XmlElement(name = "pointInPixel", required = true)
@@ -299,8 +309,9 @@ public class DefaultGeorectified extends
}
/**
- * Returns a description of the information about which grid dimensions are the spatial
- * dimensions.
+ * Returns a description of the information about which grid dimensions are the spatial dimensions.
+ *
+ * @return Description of the information about grid dimensions, or {@code null}.
*/
@Override
@XmlElement(name = "transformationDimensionDescription")
@@ -309,8 +320,7 @@ public class DefaultGeorectified extends
}
/**
- * Sets the description of the information about which grid dimensions are the spatial
- * dimensions.
+ * Sets the description of the information about which grid dimensions are the spatial dimensions.
*
* @param newValue The new transformation dimension description.
*/
@@ -321,6 +331,8 @@ public class DefaultGeorectified extends
/**
* Returns information about which grid dimensions are the spatial dimensions.
+ *
+ * @return Information about which grid dimensions are the spatial dimensions, or {@code null}.
*/
@Override
@XmlElement(name = "transformationDimensionMapping")
@@ -339,6 +351,8 @@ public class DefaultGeorectified extends
/**
* Returns the geographic references used to validate georectification of the data.
+ *
+ * @return Geographic references used to validate georectification.
*/
@Override
@XmlElement(name = "checkPoint", namespace = Namespaces.GMI)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -148,6 +148,8 @@ public class DefaultGeoreferenceable ext
/**
* Returns an indication of whether or not control point(s) exists.
+ *
+ * @return Whether or not control point(s) exists.
*/
@Override
@XmlElement(name = "controlPointAvailability", required = true)
@@ -171,6 +173,8 @@ public class DefaultGeoreferenceable ext
/**
* Returns an indication of whether or not orientation parameters are available.
+ *
+ * @return Whether or not orientation parameters are available.
*/
@Override
@XmlElement(name = "orientationParameterAvailability", required = true)
@@ -194,6 +198,8 @@ public class DefaultGeoreferenceable ext
/**
* Returns a description of parameters used to describe sensor orientation.
+ *
+ * @return Description of parameters used to describe sensor orientation, or {@code null}.
*/
@Override
@XmlElement(name = "orientationParameterDescription")
@@ -213,6 +219,8 @@ public class DefaultGeoreferenceable ext
/**
* Returns the terms which support grid data georeferencing.
+ *
+ * @return Terms which support grid data georeferencing, or {@code null}.
*/
@Override
/// @XmlElement(name = "georeferencedParameters", required = true)
@@ -232,6 +240,8 @@ public class DefaultGeoreferenceable ext
/**
* Returns a reference providing description of the parameters.
+ *
+ * @return Reference providing description of the parameters.
*/
@Override
@XmlElement(name = "parameterCitation")
@@ -251,9 +261,7 @@ public class DefaultGeoreferenceable ext
/**
* Returns the information that can be used to geolocate the data.
*
- * @todo This attribute is declared as mandatory in ISO 19115-2. However metadata compliant
- * with ISO 19115 (without the -2 part) do not contains this attribute. How should we
- * handle the XML formatting for this one?
+ * @return A geolocalisation of the data.
*/
@Override
@XmlElement(name = "geolocationInformation", namespace = Namespaces.GMI, required = true)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -159,6 +159,8 @@ public class DefaultGridSpatialRepresent
/**
* Returns the number of independent spatial-temporal axes.
+ *
+ * @return Number of independent spatial-temporal axes, or {@code null}.
*/
@Override
@ValueRange(minimum=0)
@@ -179,6 +181,8 @@ public class DefaultGridSpatialRepresent
/**
* Returns information about spatial-temporal axis properties.
+ *
+ * @return Information about spatial-temporal axis properties.
*/
@Override
@XmlElement(name = "axisDimensionProperties", required = true)
@@ -199,6 +203,8 @@ public class DefaultGridSpatialRepresent
/**
* Returns the identification of grid data as point or cell.
+ *
+ * @return Identification of grid data as point or cell, or {@code null}.
*/
@Override
@XmlElement(name = "cellGeometry", required = true)
@@ -218,6 +224,8 @@ public class DefaultGridSpatialRepresent
/**
* Returns indication of whether or not parameters for transformation exists.
+ *
+ * @return Whether or not parameters for transformation exists.
*/
@Override
@XmlElement(name = "transformationParameterAvailability", required = true)
Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -108,6 +108,8 @@ public class DefaultVectorSpatialReprese
/**
* Returns the code which identifies the degree of complexity of the spatial relationships.
+ *
+ * @return The degree of complexity of the spatial relationships, or {@code null}.
*/
@Override
@XmlElement(name = "topologyLevel")
@@ -127,6 +129,8 @@ public class DefaultVectorSpatialReprese
/**
* Returns information about the geometric objects used in the dataset.
+ *
+ * @return Information about the geometric objects used in the dataset, or {@code null}.
*/
@Override
@XmlElement(name = "geometricObjects")
Modified: sis/branches/0.3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -74,7 +74,7 @@ public final strictfp class ImmutableIde
}
/**
- * Tests the constructor with the {@code "remarks"} attribute as an {@link InternationalString}.
+ * Tests the constructor with the {@code "remarks"} attribute as a {@link SimpleInternationalString}.
*/
@Test
@DependsOnMethod("testConstructorWithStringValues")
@@ -105,9 +105,9 @@ public final strictfp class ImmutableIde
final ImmutableIdentifier identifier = new ImmutableIdentifier(properties);
Validators.validate(identifier);
- assertEquals(CODE_KEY, "This is a code", identifier.getCode());
- assertEquals(AUTHORITY_KEY, "An other authority", identifier.getAuthority().getTitle().toString());
- assertEquals(VERSION_KEY, "This is a version", identifier.getVersion());
+ assertEquals(CODE_KEY, "This is a code", identifier.getCode());
+ assertEquals(AUTHORITY_KEY, "An other authority", identifier.getAuthority().getTitle().toString());
+ assertEquals(VERSION_KEY, "This is a version", identifier.getVersion());
assertEquals("remarks", "There is remarks", identifier.getRemarks().toString(Locale.ENGLISH));
assertEquals("remarks_fr", "Voici des remarques", identifier.getRemarks().toString(Locale.FRENCH));
assertEquals("remarks_fr_CA", "Pareil", identifier.getRemarks().toString(Locale.CANADA_FRENCH));
Modified: sis/branches/0.3/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-referencing/pom.xml?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-referencing/pom.xml (original)
+++ sis/branches/0.3/core/sis-referencing/pom.xml Tue Jul 9 09:30:47 2013
@@ -28,6 +28,7 @@
<version>0.3-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-referencing</artifactId>
<packaging>bundle</packaging>
<name>Apache SIS referencing</name>
@@ -77,7 +78,7 @@ Implementations of Coordinate Reference
<!-- Collect JAR files in <root>/target/binaries directory. -->
<plugin>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-build-helper</artifactId>
<version>${sis.plugin.version}</version>
<executions>
@@ -108,7 +109,7 @@ Implementations of Coordinate Reference
=========================================================== -->
<dependencies>
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
<version>${project.version}</version>
</dependency>
@@ -123,7 +124,7 @@ Implementations of Coordinate Reference
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
Modified: sis/branches/0.3/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-utility/pom.xml?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-utility/pom.xml (original)
+++ sis/branches/0.3/core/sis-utility/pom.xml Tue Jul 9 09:30:47 2013
@@ -32,6 +32,7 @@
<!-- ===========================================================
Module Description
=========================================================== -->
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
<packaging>bundle</packaging>
<name>Apache SIS utilities</name>
@@ -131,7 +132,7 @@ Miscellaneous utilities.
<!-- Compile properties files into resources UTF files and collect JAR files. -->
<plugin>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-build-helper</artifactId>
<version>${sis.plugin.version}</version>
<executions>
Modified: sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -40,6 +40,10 @@ public abstract class AbstractFactory im
* Returns the implementor of this factory, or {@code null} if unknown.
* The default implementation tries to fetch this information from the
* manifest associated to the package of this class.
+ *
+ * @return The vendor for this factory implementation, or {@code null} if unknown.
+ *
+ * @see Package#getImplementationVendor()
*/
@Override
public Citation getVendor() {
Modified: sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java [UTF-8] Tue Jul 9 09:30:47 2013
@@ -114,8 +114,8 @@ public class DefaultNameSpace implements
* However we can (in an opportunist way) handles local names as well. In case of conflict,
* the namespace will have precedence.
*
- * <p>This field is initialized soon after {@code DefaultNameSpace} and should be treated
- * like a final field from that point.</p>
+ * <p>This field is initialized by {@link #init()} soon after {@code DefaultNameSpace} creation
+ * and shall be treated like a final field from that point.</p>
*/
private transient WeakValueHashMap<String,Object> childs;
@@ -372,6 +372,7 @@ public class DefaultNameSpace implements
if (name == null) {
name = key;
}
+ final WeakValueHashMap<String,Object> childs = this.childs; // Paranoiac protection against accidental changes.
DefaultNameSpace child;
synchronized (childs) {
final Object existing = childs.get(key);
@@ -412,6 +413,7 @@ public class DefaultNameSpace implements
final DefaultLocalName local(final CharSequence name, final DefaultLocalName candidate) {
ensureNonNull("name", name);
final String key = name.toString();
+ final WeakValueHashMap<String,Object> childs = this.childs; // Paranoiac protection against accidental changes.
DefaultLocalName child;
synchronized (childs) {
final Object existing = childs.get(key);
Modified: sis/branches/0.3/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.3/pom.xml?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/pom.xml (original)
+++ sis/branches/0.3/pom.xml Tue Jul 9 09:30:47 2013
@@ -480,7 +480,7 @@ Apache SIS is a free software, Java lang
<version>${findbugs.version}</version>
<dependencies>
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-build-helper</artifactId>
<version>${sis.plugin.version}</version>
</dependency>
@@ -592,7 +592,7 @@ Apache SIS is a free software, Java lang
<taglet><tagletClass>org.apache.sis.internal.taglet.SourceRepositoryURL</tagletClass></taglet>
</taglets>
<tagletArtifact>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-build-helper</artifactId>
<version>${sis.plugin.version}</version>
</tagletArtifact>
Modified: sis/branches/0.3/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/sis/branches/0.3/src/site/apt/download.apt?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/src/site/apt/download.apt [UTF-8] (original)
+++ sis/branches/0.3/src/site/apt/download.apt [UTF-8] Tue Jul 9 09:30:47 2013
@@ -38,7 +38,7 @@ Downloading Apache SIS Binaries
<dependencies>
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-referencing</artifactId>
<version>${sis.version}</version>
</dependency>
@@ -55,7 +55,7 @@ Downloading Apache SIS Binaries
<dependencies>
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-referencing</artifactId>
<version>${sis.version}</version>
</dependency>
Modified: sis/branches/0.3/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.3/storage/pom.xml?rev=1501161&r1=1501160&r2=1501161&view=diff
==============================================================================
--- sis/branches/0.3/storage/pom.xml (original)
+++ sis/branches/0.3/storage/pom.xml Tue Jul 9 09:30:47 2013
@@ -79,7 +79,7 @@
<!-- Collect JAR files in <root>/target/binaries directory. -->
<plugin>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-build-helper</artifactId>
<version>${sis.plugin.version}</version>
<executions>
@@ -99,12 +99,12 @@
=========================================================== -->
<dependencies>
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-metadata</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-referencing</artifactId>
<version>${project.version}</version>
</dependency>
@@ -119,7 +119,7 @@
<artifactId>geoapi-conformance</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.sis</groupId>
+ <groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
<version>${project.version}</version>
<type>test-jar</type>